From fbc6718e06785e8ea6bebb1e354b3ad3967bcc86 Mon Sep 17 00:00:00 2001 From: "bernard.paques" Date: Sun, 17 May 2009 21:29:32 +0000 Subject: [PATCH] yacs 5.9beta16 git-svn-id: http://yacs.googlecode.com/svn/trunk@65 799ccead-9442-0410-8758-a113ef2b9449 --- agents/configure.php | 2 +- articles/articles.php | 19 +- articles/edit.php | 37 +- articles/layout_articles_as_thread.php | 2 +- articles/print.php | 2 +- articles/view.php | 19 +- articles/view_as_chat.php | 50 ++- articles/view_as_tabs.php | 62 ++- categories/categories.php | 14 +- categories/edit.php | 62 ++- codes/basic.php | 54 +-- codes/blocks.php | 66 ++-- codes/links.php | 58 +-- codes/lists.php | 14 +- codes/live.php | 36 +- codes/misc.php | 14 +- codes/tables.php | 14 +- codes/titles.php | 34 +- collections/configure.php | 2 +- configure.php | 2 +- control/configure.php | 6 +- control/htaccess/index.php | 2 +- control/index.php | 6 +- control/info.php | 6 +- control/populate.php | 2 +- control/purge.php | 4 +- control/scan.php | 4 +- control/switch.php | 2 +- control/virtual.php | 2 +- feeds/configure.php | 2 +- feeds/flash/configure.php | 2 +- feeds/index.php | 2 +- files/configure.php | 2 +- files/edit.php | 4 +- files/files.php | 11 +- footprints.php | 283 +++++++++----- help/index.php | 4 +- help/populate.php | 2 +- i18n/i18n.php | 7 +- .../locale/en/actions.mo.php | 5 +- .../locale/en/agents.mo.php | 5 +- .../locale/en/articles.mo.php | 13 +- .../locale/en/behaviors.mo.php | 5 +- .../locale/en/categories.mo.php | 13 +- .../locale/en/codes.mo.php | 15 +- .../locale/en/collections.mo.php | 5 +- .../locale/en/comments.mo.php | 5 +- .../locale/en/control.mo.php | 13 +- .../locale/en/dates.mo.php | 5 +- .../locale/en/decisions.mo.php | 5 +- .../locale/en/feeds.mo.php | 11 +- .../locale/en/files.mo.php | 7 +- .../locale/en/forms.mo.php | 5 +- .../locale/en/help.mo.php | 14 +- .../locale/en/i18n.mo.php | 5 +- .../locale/en/images.mo.php | 5 +- .../locale/en/letters.mo.php | 5 +- .../locale/en/links.mo.php | 5 +- .../locale/en/locations.mo.php | 7 +- i18n/locale/en/manifest.php | 2 + .../locale/en/overlays.mo.php | 5 +- .../locale/en/root.mo.php | 15 +- .../locale/en/scripts.mo.php | 14 +- .../locale/en/sections.mo.php | 19 +- .../locale/en/servers.mo.php | 5 +- .../locale/en/services.mo.php | 5 +- .../locale/en/shared.mo.php | 21 +- .../locale/en/skins.mo.php | 7 +- .../locale/en/smileys.mo.php | 5 +- .../locale/en/tables.mo.php | 5 +- .../locale/en/tools.mo.php | 23 +- .../locale/en/users.mo.php | 73 ++-- .../locale/en/versions.mo.php | 5 +- .../locale/fr/actions.mo.php | 5 +- .../locale/fr/agents.mo.php | 9 +- .../locale/fr/articles.mo.php | 15 +- .../locale/fr/behaviors.mo.php | 5 +- .../locale/fr/categories.mo.php | 13 +- .../locale/fr/codes.mo.php | 15 +- .../locale/fr/collections.mo.php | 5 +- .../locale/fr/comments.mo.php | 5 +- .../locale/fr/control.mo.php | 13 +- .../locale/fr/dates.mo.php | 5 +- .../locale/fr/decisions.mo.php | 5 +- .../locale/fr/feeds.mo.php | 13 +- .../locale/fr/files.mo.php | 7 +- .../locale/fr/forms.mo.php | 11 +- .../locale/fr/help.mo.php | 14 +- .../locale/fr/i18n.mo.php | 5 +- .../locale/fr/images.mo.php | 5 +- .../locale/fr/letters.mo.php | 5 +- .../locale/fr/links.mo.php | 5 +- .../locale/fr/locations.mo.php | 7 +- i18n/locale/fr/manifest.php | 2 + .../locale/fr/overlays.mo.php | 9 +- .../locale/fr/root.mo.php | 15 +- .../locale/fr/scripts.mo.php | 14 +- .../locale/fr/sections.mo.php | 23 +- .../locale/fr/servers.mo.php | 5 +- .../locale/fr/services.mo.php | 5 +- .../locale/fr/shared.mo.php | 21 +- .../locale/fr/skins.mo.php | 7 +- .../locale/fr/smileys.mo.php | 5 +- .../locale/fr/tables.mo.php | 5 +- .../locale/fr/tools.mo.php | 21 +- .../locale/fr/users.mo.php | 73 ++-- .../locale/fr/versions.mo.php | 5 +- images/edit.php | 2 +- included/browser/library.js | 5 - included/browser/minify.php | 34 -- included/browser/player_flv_maxi.swf | Bin 0 -> 12975 bytes included/fckeditor/fckeditor.php | 3 + included/fckeditor/fckeditor_php5.php | 3 + included/jscalendar/minify.php | 133 ------- letters/configure.php | 2 +- locations/locations.php | 6 +- overlays/overlay.php | 21 +- scripts/build.php | 6 +- scripts/check.php | 130 ++++++ scripts/configure.php | 2 +- scripts/run_once/090516_misc_update.php | 95 +++++ scripts/run_once/090516_remove_obsolete.php | 73 ++++ scripts/scripts.php | 51 +++ scripts/update.php | 2 +- scripts/update_trailer.php | 5 +- sections/edit.php | 59 ++- .../layout_sections_as_boxesandarrows.php | 12 +- sections/layout_sections_as_folded.php | 2 +- sections/layout_sections_as_jive.php | 4 +- sections/layout_sections_as_select.php | 2 +- sections/layout_sections_as_yabb.php | 4 +- sections/layout_sections_as_yahoo.php | 6 +- sections/manage.php | 6 +- sections/print.php | 4 +- sections/section.php | 8 +- sections/sections.php | 8 +- sections/view.php | 27 +- sections/view_as_tabs.php | 43 +- servers/configure.php | 2 +- services/configure.php | 2 +- services/xml_rpc_codec.php | 2 +- setup.php | 4 +- shared/codes.php | 42 +- shared/global.php | 19 +- shared/members.php | 54 ++- shared/safe.php | 11 +- shared/surfer.php | 94 +---- shared/xml.php | 101 +++++ skins/configure.php | 2 +- skins/page.php | 4 +- skins/skin_skeleton.php | 97 ++++- skins/test.php | 2 +- tables/tables.php | 6 +- tables/view.php | 2 +- .../cache_included_jscalendar_minify-en.js | 337 ---------------- .../cache_included_jscalendar_minify-fr.js | 339 ---------------- tools/ajax.php | 3 + tools/embed.php | 3 + tools/fat_index.php | 3 + tools/form.php | 3 + tools/hello.php | 3 + included/browser/build.php => tools/jsmin.php | 64 ++- tools/transform.php | 67 ++++ users/configure.php | 6 +- users/contact.php | 4 +- users/edit.php | 370 +++++++++--------- users/element.php | 46 ++- users/fetch_vcard.php | 30 +- users/layout_users_as_comma.php | 99 +++++ users/layout_users_as_compact.php | 20 +- users/layout_users_as_watch.php | 25 +- users/mail.php | 2 +- users/password.php | 8 +- users/select.php | 19 +- users/track.php | 56 ++- users/users.php | 6 + users/view.php | 341 ++++++++++------ 177 files changed, 2607 insertions(+), 2099 deletions(-) rename temporary/cache_i18n_locale_en_actions.mo.php => i18n/locale/en/actions.mo.php (98%) rename temporary/cache_i18n_locale_en_agents.mo.php => i18n/locale/en/agents.mo.php (98%) rename temporary/cache_i18n_locale_en_articles.mo.php => i18n/locale/en/articles.mo.php (98%) rename temporary/cache_i18n_locale_en_behaviors.mo.php => i18n/locale/en/behaviors.mo.php (96%) rename temporary/cache_i18n_locale_en_categories.mo.php => i18n/locale/en/categories.mo.php (97%) rename temporary/cache_i18n_locale_en_codes.mo.php => i18n/locale/en/codes.mo.php (98%) rename temporary/cache_i18n_locale_en_collections.mo.php => i18n/locale/en/collections.mo.php (99%) rename temporary/cache_i18n_locale_en_comments.mo.php => i18n/locale/en/comments.mo.php (99%) rename temporary/cache_i18n_locale_en_control.mo.php => i18n/locale/en/control.mo.php (99%) rename temporary/cache_i18n_locale_en_dates.mo.php => i18n/locale/en/dates.mo.php (98%) rename temporary/cache_i18n_locale_en_decisions.mo.php => i18n/locale/en/decisions.mo.php (98%) rename temporary/cache_i18n_locale_en_feeds.mo.php => i18n/locale/en/feeds.mo.php (96%) rename temporary/cache_i18n_locale_en_files.mo.php => i18n/locale/en/files.mo.php (99%) rename temporary/cache_i18n_locale_en_forms.mo.php => i18n/locale/en/forms.mo.php (98%) rename temporary/cache_i18n_locale_en_help.mo.php => i18n/locale/en/help.mo.php (98%) rename temporary/cache_i18n_locale_en_i18n.mo.php => i18n/locale/en/i18n.mo.php (99%) rename temporary/cache_i18n_locale_en_images.mo.php => i18n/locale/en/images.mo.php (99%) rename temporary/cache_i18n_locale_en_letters.mo.php => i18n/locale/en/letters.mo.php (98%) rename temporary/cache_i18n_locale_en_links.mo.php => i18n/locale/en/links.mo.php (99%) rename temporary/cache_i18n_locale_en_locations.mo.php => i18n/locale/en/locations.mo.php (98%) rename temporary/cache_i18n_locale_en_overlays.mo.php => i18n/locale/en/overlays.mo.php (99%) rename temporary/cache_i18n_locale_en_root.mo.php => i18n/locale/en/root.mo.php (98%) rename temporary/cache_i18n_locale_en_scripts.mo.php => i18n/locale/en/scripts.mo.php (96%) rename temporary/cache_i18n_locale_en_sections.mo.php => i18n/locale/en/sections.mo.php (98%) rename temporary/cache_i18n_locale_en_servers.mo.php => i18n/locale/en/servers.mo.php (99%) rename temporary/cache_i18n_locale_en_services.mo.php => i18n/locale/en/services.mo.php (98%) rename temporary/cache_i18n_locale_en_shared.mo.php => i18n/locale/en/shared.mo.php (87%) rename temporary/cache_i18n_locale_en_skins.mo.php => i18n/locale/en/skins.mo.php (99%) rename temporary/cache_i18n_locale_en_smileys.mo.php => i18n/locale/en/smileys.mo.php (98%) rename temporary/cache_i18n_locale_en_tables.mo.php => i18n/locale/en/tables.mo.php (98%) rename temporary/cache_i18n_locale_en_tools.mo.php => i18n/locale/en/tools.mo.php (90%) rename temporary/cache_i18n_locale_en_users.mo.php => i18n/locale/en/users.mo.php (91%) rename temporary/cache_i18n_locale_en_versions.mo.php => i18n/locale/en/versions.mo.php (96%) rename temporary/cache_i18n_locale_fr_actions.mo.php => i18n/locale/fr/actions.mo.php (98%) rename temporary/cache_i18n_locale_fr_agents.mo.php => i18n/locale/fr/agents.mo.php (97%) rename temporary/cache_i18n_locale_fr_articles.mo.php => i18n/locale/fr/articles.mo.php (98%) rename temporary/cache_i18n_locale_fr_behaviors.mo.php => i18n/locale/fr/behaviors.mo.php (96%) rename temporary/cache_i18n_locale_fr_categories.mo.php => i18n/locale/fr/categories.mo.php (97%) rename temporary/cache_i18n_locale_fr_codes.mo.php => i18n/locale/fr/codes.mo.php (98%) rename temporary/cache_i18n_locale_fr_collections.mo.php => i18n/locale/fr/collections.mo.php (99%) rename temporary/cache_i18n_locale_fr_comments.mo.php => i18n/locale/fr/comments.mo.php (99%) rename temporary/cache_i18n_locale_fr_control.mo.php => i18n/locale/fr/control.mo.php (99%) rename temporary/cache_i18n_locale_fr_dates.mo.php => i18n/locale/fr/dates.mo.php (98%) rename temporary/cache_i18n_locale_fr_decisions.mo.php => i18n/locale/fr/decisions.mo.php (98%) rename temporary/cache_i18n_locale_fr_feeds.mo.php => i18n/locale/fr/feeds.mo.php (96%) rename temporary/cache_i18n_locale_fr_files.mo.php => i18n/locale/fr/files.mo.php (99%) rename temporary/cache_i18n_locale_fr_forms.mo.php => i18n/locale/fr/forms.mo.php (96%) rename temporary/cache_i18n_locale_fr_help.mo.php => i18n/locale/fr/help.mo.php (98%) rename temporary/cache_i18n_locale_fr_i18n.mo.php => i18n/locale/fr/i18n.mo.php (99%) rename temporary/cache_i18n_locale_fr_images.mo.php => i18n/locale/fr/images.mo.php (99%) rename temporary/cache_i18n_locale_fr_letters.mo.php => i18n/locale/fr/letters.mo.php (98%) rename temporary/cache_i18n_locale_fr_links.mo.php => i18n/locale/fr/links.mo.php (99%) rename temporary/cache_i18n_locale_fr_locations.mo.php => i18n/locale/fr/locations.mo.php (98%) rename temporary/cache_i18n_locale_fr_overlays.mo.php => i18n/locale/fr/overlays.mo.php (98%) rename temporary/cache_i18n_locale_fr_root.mo.php => i18n/locale/fr/root.mo.php (98%) rename temporary/cache_i18n_locale_fr_scripts.mo.php => i18n/locale/fr/scripts.mo.php (96%) rename temporary/cache_i18n_locale_fr_sections.mo.php => i18n/locale/fr/sections.mo.php (98%) rename temporary/cache_i18n_locale_fr_servers.mo.php => i18n/locale/fr/servers.mo.php (99%) rename temporary/cache_i18n_locale_fr_services.mo.php => i18n/locale/fr/services.mo.php (99%) rename temporary/cache_i18n_locale_fr_shared.mo.php => i18n/locale/fr/shared.mo.php (87%) rename temporary/cache_i18n_locale_fr_skins.mo.php => i18n/locale/fr/skins.mo.php (99%) rename temporary/cache_i18n_locale_fr_smileys.mo.php => i18n/locale/fr/smileys.mo.php (98%) rename temporary/cache_i18n_locale_fr_tables.mo.php => i18n/locale/fr/tables.mo.php (98%) rename temporary/cache_i18n_locale_fr_tools.mo.php => i18n/locale/fr/tools.mo.php (91%) rename temporary/cache_i18n_locale_fr_users.mo.php => i18n/locale/fr/users.mo.php (91%) rename temporary/cache_i18n_locale_fr_versions.mo.php => i18n/locale/fr/versions.mo.php (96%) delete mode 100644 included/browser/minify.php create mode 100644 included/browser/player_flv_maxi.swf delete mode 100644 included/jscalendar/minify.php create mode 100644 scripts/check.php create mode 100644 scripts/run_once/090516_misc_update.php create mode 100644 scripts/run_once/090516_remove_obsolete.php delete mode 100644 temporary/cache_included_jscalendar_minify-en.js delete mode 100644 temporary/cache_included_jscalendar_minify-fr.js rename included/browser/build.php => tools/jsmin.php (78%) create mode 100644 tools/transform.php create mode 100644 users/layout_users_as_comma.php diff --git a/agents/configure.php b/agents/configure.php index d2995aea2..540703741 100644 --- a/agents/configure.php +++ b/agents/configure.php @@ -342,7 +342,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folded'); // follow-up commands $follow_up = i18n::s('Where do you want to go now?'); diff --git a/articles/articles.php b/articles/articles.php index a80c7c82e..4dc2ed257 100644 --- a/articles/articles.php +++ b/articles/articles.php @@ -561,9 +561,9 @@ function &get_attributes($id, $attributes, $mutable=FALSE) { $id = (string)$id; $id = utf8::encode($id); - // strip extra text from enhanced ids '3-page-title' -> '3' - if($position = strpos($id, '-')) - $id = substr($id, 0, $position); +// // strip extra text from enhanced ids '3-page-title' -> '3' +// if($position = strpos($id, '-')) +// $id = substr($id, 0, $position); // cache previous answers static $cache; @@ -588,8 +588,8 @@ function &get_attributes($id, $attributes, $mutable=FALSE) { // do the job $output =& SQL::query_first($query); - // save in cache - if(isset($output['id'])) + // save in cache, but only on generic request + if(!$mutable && isset($output['id']) && ($attributes == '*')) $cache[$id] = $output; // return by reference @@ -1011,11 +1011,12 @@ function &list_($offset=0, $count=10, $layout='decorated', $since=NULL) { * @param int the number of items to display * @param string 'decorated', etc or object, i.e., an instance of Layout_Interface * @param boolean TRUE to list only pages shared with this surfer, FALSE otherwise + * @param boolean TRUE to list live pages, or FALSE to list locked and archived pages * @return NULL on error, else an ordered array with $url => ($prefix, $label, $suffix, $icon) * * @see users/view.php */ - function &list_assigned_by_date_for_anchor($anchor=NULL, $surfer_id, $offset=0, $count=20, $variant='decorated', $shared_page=FALSE) { + function &list_assigned_by_date_for_anchor($anchor=NULL, $surfer_id, $offset=0, $count=20, $variant='decorated', $shared_page=FALSE, $live=TRUE) { global $context; // display active items @@ -1047,6 +1048,12 @@ function &list_assigned_by_date_for_anchor($anchor=NULL, $surfer_id, $offset=0, } elseif($anchor) $where = "(articles.anchor LIKE '".SQL::escape($anchor)."') AND ".$where; + // only live pages + if($live) + $where .= " AND (articles.locked != 'Y')"; + else + $where .= " AND (articles.locked = 'Y')"; + // limit to pages shared with this surfer if($shared_page) $query = "SELECT articles.*" diff --git a/articles/edit.php b/articles/edit.php index 745a7e09e..91b7a51b6 100644 --- a/articles/edit.php +++ b/articles/edit.php @@ -688,24 +688,22 @@ $fields[] = array($label, $input, $hint); // the introduction - $label = i18n::s('Introduction'); + if(!is_object($overlay) || !($label = $overlay->get_label('introduction', isset($item['id'])?'edit':'new'))) + $label = i18n::s('Introduction'); $value = ''; if(isset($item['introduction']) && $item['introduction']) $value = $item['introduction']; elseif(isset($_SESSION['pasted_introduction'])) $value = $_SESSION['pasted_introduction']; $input = ''; - $hint = i18n::s('Also complements the title in lists featuring this page'); + if(!is_object($overlay) || !($hint = $overlay->get_label('introduction_hint', isset($item['id'])?'edit':'new'))) + $hint = i18n::s('Also complements the title in lists featuring this page'); $fields[] = array($label, $input, $hint); // include overlay fields, if any - if(is_object($overlay)) { - - // append editing fields for this overlay + if(is_object($overlay)) $fields = array_merge($fields, $overlay->get_fields($item)); - } - // the description label if(!is_object($overlay) || !($label = $overlay->get_label('description', isset($item['id'])?'edit':'new'))) $label = i18n::s('Description'); @@ -717,7 +715,9 @@ elseif(isset($_SESSION['pasted_text'])) $value = $_SESSION['pasted_text']; $input = Surfer::get_editor('description', $value); - $fields[] = array($label, $input); + if(!is_object($overlay) || !($hint = $overlay->get_label('description_hint', isset($item['id'])?'edit':'new'))) + $hint = ''; + $fields[] = array($label, $input, $hint); // tags $label = i18n::s('Tags'); @@ -780,7 +780,7 @@ // in a folded box if($box) - $information .= Skin::build_box(i18n::s('Images'), $box, 'folder', 'edit_images'); + $information .= Skin::build_box(i18n::s('Images'), $box, 'folded', 'edit_images'); } @@ -792,7 +792,7 @@ if(Locations::are_allowed($anchor, $item)) { $menu = array( 'locations/edit.php?anchor='.urlencode('article:'.$item['id']) => i18n::s('Add a location') ); $items = Locations::list_by_date_for_anchor('article:'.$item['id'], 0, 50, NULL); - $information .= Skin::build_box(i18n::s('Locations'), Skin::build_list($menu, 'menu_bar').Skin::build_list($items, 'decorated'), 'folder'); + $information .= Skin::build_box(i18n::s('Locations'), Skin::build_list($menu, 'menu_bar').Skin::build_list($items, 'decorated'), 'folded'); } // tables are reserved to associates @@ -800,7 +800,7 @@ if(Tables::are_allowed($anchor, $item)) { $menu = array( 'tables/edit.php?anchor='.urlencode('article:'.$item['id']) => i18n::s('Add a table') ); $items = Tables::list_by_date_for_anchor('article:'.$item['id'], 0, 50, NULL); - $information .= Skin::build_box(i18n::s('Tables'), Skin::build_list($menu, 'menu_bar').Skin::build_list($items, 'decorated'), 'folder'); + $information .= Skin::build_box(i18n::s('Tables'), Skin::build_list($menu, 'menu_bar').Skin::build_list($items, 'decorated'), 'folded'); } } @@ -845,7 +845,7 @@ $fields[] = array($label, $input, $hint); // add a folded box - $information .= Skin::build_box(i18n::s('More content'), Skin::build_form($fields), 'folder'); + $information .= Skin::build_box(i18n::s('More content'), Skin::build_form($fields), 'folded'); $fields = array(); // @@ -853,10 +853,7 @@ // $content = ''; - // this page - // - - // the section, if one has not been defined yet or when an associate may move one + // the section if(!is_object($anchor) || isset($item['id'])) { $label = i18n::s('Section'); $input = Sections::get_radio_buttons($item['anchor'] ? $item['anchor'] : $_REQUEST['anchor']); @@ -918,7 +915,7 @@ // add a folded box if(count($fields)) - $content .= Skin::build_box(i18n::s('Attachments'), Skin::build_form($fields), 'folder'); + $content .= Skin::build_box(i18n::s('Attachments'), Skin::build_form($fields), 'folded'); $fields = array(); // home panel @@ -938,7 +935,7 @@ // add a folded box if($front) - $content .= Skin::build_box(i18n::s('Contribution to the site front page'), $front, 'folder'); + $content .= Skin::build_box(i18n::s('Contribution to the site front page'), $front, 'folded'); $fields = array(); // @@ -952,7 +949,7 @@ $label = Skin::build_link(Users::get_url('article:'.$item['id'], 'select'), i18n::s('Editors'), 'basic'); else $label = i18n::s('Editors'); - if(isset($item['id']) && ($items =& Members::list_editors_by_name_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'compact'))) + if(isset($item['id']) && ($items =& Members::list_editors_by_name_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'comma'))) $input =& Skin::build_list($items, 'comma'); else $input = i18n::s('Nobody has been assigned to this page.'); @@ -1125,7 +1122,7 @@ // add a folded box - $options .= Skin::build_box(i18n::s('More options'), Skin::build_form($fields), 'folder'); + $options .= Skin::build_box(i18n::s('More options'), Skin::build_form($fields), 'folded'); $fields = array(); // diff --git a/articles/layout_articles_as_thread.php b/articles/layout_articles_as_thread.php index e0297d737..14302d980 100644 --- a/articles/layout_articles_as_thread.php +++ b/articles/layout_articles_as_thread.php @@ -121,7 +121,7 @@ function &layout(&$result) { $details[] = LOCKED_FLAG; // page editors, except target surfer - if($friends =& Members::list_users_by_posts_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'compact', $this->layout_variant)) + if($friends =& Members::list_users_by_posts_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'comma', $this->layout_variant)) $details[] = sprintf(i18n::s('with %s'), Skin::build_list($friends, 'comma')); // combine in-line details diff --git a/articles/print.php b/articles/print.php index dd694637f..f1963d050 100644 --- a/articles/print.php +++ b/articles/print.php @@ -188,7 +188,7 @@ $items = Comments::list_by_date_for_anchor('article:'.$item['id'], 0, 500, 'excerpt'); // actually list items - if(count($items)) + if(is_array($items)) $context['text'] .= Skin::build_box(i18n::s('Comments'), Skin::build_list($items, 'rows')); // diff --git a/articles/view.php b/articles/view.php index 0d6c59be6..ca1d9a80a 100644 --- a/articles/view.php +++ b/articles/view.php @@ -115,6 +115,7 @@ * * @author Bernard Paques * @author GnapZ + * @author Christophe Battarel [email]christophe.battarel@altairis.fr[/email] * @tester Ghjmora * @tester Eoin * @tester Mark @@ -635,10 +636,14 @@ $details[] = EXPIRED_FLAG.' '.sprintf(i18n::s('Page has expired %s'), Skin::build_date($item['expiry_date'])); } - // article editors, for associates and section editors - if((Surfer::is_associate() || Articles::is_assigned($item['id']) || (is_object($anchor) && $anchor->is_editable())) && ($items =& Members::list_users_by_posts_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'compact'))) + // page editors, for associates and section editors + if(Surfer::is_empowered() && Surfer::is_logged() && ($items =& Members::list_users_by_posts_for_member('article:'.$item['id'], 0, USERS_LIST_SIZE, 'comma'))) $details[] = sprintf(i18n::s('%s: %s'), Skin::build_link(Users::get_url('article:'.$item['id'], 'select'), i18n::s('Editors')), Skin::build_list($items, 'comma')); + // page watchers + if(Surfer::is_logged() && ($items =& Members::list_watchers_by_posts_for_anchor('article:'.$item['id'], 0, 50, 'comma'))) + $details[] = sprintf(i18n::s('%s: %s'), i18n::s('Watchers'), Skin::build_list($items, 'comma')); + // no more details if(count($details)) $text .= ucfirst(implode(BR."\n", $details)).BR."\n"; @@ -839,15 +844,21 @@ } + // filter description, if necessary + if(is_object($overlay)) + $description = $overlay->get_text('description', $item); + else + $description = $item['description']; + // the beautified description, which is the actual page body - if(trim($item['description'])) { + if($description) { // use adequate label if(is_object($overlay) && ($label = $overlay->get_label('description'))) $text .= Skin::build_block($label, 'title'); // provide only the requested page - $pages = preg_split('/\s*\[page\]\s*/is', $item['description']); + $pages = preg_split('/\s*\[page\]\s*/is', $description); if($page > count($pages)) $page = count($pages); if($page < 1) diff --git a/articles/view_as_chat.php b/articles/view_as_chat.php index ea95c431a..61a46e09f 100644 --- a/articles/view_as_chat.php +++ b/articles/view_as_chat.php @@ -451,8 +451,44 @@ if(is_object($overlay)) $context['text'] .= $overlay->get_text('view', $item); + // filter description, if necessary + if(is_object($overlay)) + $description = $overlay->get_text('description', $item); + else + $description = $item['description']; + // the beautified description, which is the actual page body - $context['text'] .= Skin::build_block($item['description'], 'description', '', $item['options']); + if($description) { + + // use adequate label + if(is_object($overlay) && ($label = $overlay->get_label('description'))) + $context['text'] .= Skin::build_block($label, 'title'); + + // provide only the requested page + $pages = preg_split('/\s*\[page\]\s*/is', $description); + if($page > count($pages)) + $page = count($pages); + if($page < 1) + $page = 1; + $description = $pages[ $page-1 ]; + + // if there are several pages, remove toc and toq codes + if(count($pages) > 1) + $description = preg_replace('/\s*\[(toc|toq)\]\s*/is', '', $description); + + // beautify the target page + $context['text'] .= Skin::build_block($description, 'description', '', $item['options']); + + // if there are several pages, add navigation commands to browse them + if(count($pages) > 1) { + $page_menu = array( '_' => i18n::s('Pages') ); + $home =& Sections::get_permalink($item); + $prefix = Sections::get_url($item['id'], 'navigate', 'pages'); + $page_menu = array_merge($page_menu, Skin::navigate($home, $prefix, count($pages), 1, $page)); + + $context['text'] .= Skin::build_list($page_menu, 'menu_bar'); + } + } // add trailer information from the overlay, if any if(is_object($overlay)) @@ -765,18 +801,6 @@ // $lines = array(); - // watch command is provided to logged surfers - if(Surfer::get_id() && !$zoom_type) { - - $link = Users::get_url('article:'.$item['id'], 'track'); - - if($in_watch_list) { - $label = i18n::s('Forget'); - Skin::define_img('WATCH_TOOL_IMG', 'icons/tools/watch.gif'); - $lines[] = Skin::build_link($link, WATCH_TOOL_IMG.$label, 'basic', i18n::s('Manage your watch list')); - } - } - // get news from rss if(isset($item['id']) && (!isset($context['skins_general_without_feed']) || ($context['skins_general_without_feed'] != 'Y')) ) { diff --git a/articles/view_as_tabs.php b/articles/view_as_tabs.php index f3140dcbc..eabb5d4ab 100644 --- a/articles/view_as_tabs.php +++ b/articles/view_as_tabs.php @@ -483,8 +483,44 @@ if(is_object($overlay)) $information .= $overlay->get_text('view', $item); + // filter description, if necessary + if(is_object($overlay)) + $description = $overlay->get_text('description', $item); + else + $description = $item['description']; + // the beautified description, which is the actual page body - $information .= Skin::build_block($item['description'], 'description', '', $item['options']); + if($description) { + + // use adequate label + if(is_object($overlay) && ($label = $overlay->get_label('description'))) + $information .= Skin::build_block($label, 'title'); + + // provide only the requested page + $pages = preg_split('/\s*\[page\]\s*/is', $description); + if($page > count($pages)) + $page = count($pages); + if($page < 1) + $page = 1; + $description = $pages[ $page-1 ]; + + // if there are several pages, remove toc and toq codes + if(count($pages) > 1) + $description = preg_replace('/\s*\[(toc|toq)\]\s*/is', '', $description); + + // beautify the target page + $information .= Skin::build_block($description, 'description', '', $item['options']); + + // if there are several pages, add navigation commands to browse them + if(count($pages) > 1) { + $page_menu = array( '_' => i18n::s('Pages') ); + $home =& Sections::get_permalink($item); + $prefix = Sections::get_url($item['id'], 'navigate', 'pages'); + $page_menu = array_merge($page_menu, Skin::navigate($home, $prefix, count($pages), 1, $page)); + + $information .= Skin::build_list($page_menu, 'menu_bar'); + } + } // add trailer information from the overlay, if any if(is_object($overlay)) @@ -664,6 +700,28 @@ // the list of related users if not at another follow-up page if(!$zoom_type || ($zoom_type == 'users')) { + // all followers + $followers = ''; + + // the list of followers + if($items =& Members::list_watchers_by_posts_for_anchor('article:'.$item['id'], 0, 500, 'compact')) { + if(is_array($items)) + $items = Skin::build_list($items, 'compact'); + $followers .= '

'.i18n::s('Following persons are watching this page:').'

'.$items; + } + + // suggest to watch this page --$in_watch_list is set in articles/view.php + if(Surfer::get_id() && !$in_watch_list) { + + Skin::define_img('WATCH_TOOL_IMG', 'icons/tools/watch.gif'); + $followers .= '

'.Skin::build_link(Articles::get_permalink($item), WATCH_TOOL_IMG.i18n::s('Watch this page'), 'button', i18n::s('To be notified when this page is changed')).'

'; + + } + + // put followers in a sidebar + if($followers) + $users .= Skin::build_box(NULL, $followers, 'sidebar'); + // cache panel content $cache_id = 'articles/view_as_tabs.php?id='.$item['id'].'#users#'.$zoom_index; if(!$text =& Cache::get($cache_id)) { @@ -700,7 +758,7 @@ if(is_array($box['bar'])) $box['text'] .= Skin::build_list($box['bar'], 'menu_bar'); if($box['text']) - $text =$box['text']; + $text = $box['text']; } diff --git a/categories/categories.php b/categories/categories.php index 99fb60179..348fd1f8a 100644 --- a/categories/categories.php +++ b/categories/categories.php @@ -148,9 +148,9 @@ function are_allowed($anchor=NULL, $item=NULL) { if(is_object($anchor) && is_callable(array($anchor, 'has_option')) && $anchor->has_option('no_categories')) return FALSE; - // submissions have been disallowed globally - if(isset($context['users_without_submission']) && ($context['users_without_submission'] == 'Y')) - return FALSE; +// // submissions have been disallowed globally +// if(isset($context['users_without_submission']) && ($context['users_without_submission'] == 'Y')) +// return FALSE; // ok, all tests have been passed return TRUE; @@ -322,9 +322,9 @@ function &get($id, $mutable=FALSE) { $id = (string)$id; $id = utf8::encode($id); - // strip extra text from enhanced ids '3-topic' -> '3' - if($position = strpos($id, '-')) - $id = substr($id, 0, $position); +// // strip extra text from enhanced ids '3-topic' -> '3' +// if($position = strpos($id, '-')) +// $id = substr($id, 0, $position); // cache previous answers static $cache; @@ -350,7 +350,7 @@ function &get($id, $mutable=FALSE) { $output =& SQL::query_first($query); // save in cache - if(isset($output['id'])) + if(!$mutable && isset($output['id'])) $cache[$id] = $output; // return by reference diff --git a/categories/edit.php b/categories/edit.php index e8d9ac400..c05c87ba8 100644 --- a/categories/edit.php +++ b/categories/edit.php @@ -351,7 +351,7 @@ // in a folded box if($box) - $index .= Skin::build_box(i18n::s('Images'), $box, 'folder', 'edit_images'); + $index .= Skin::build_box(i18n::s('Images'), $box, 'folded', 'edit_images'); } @@ -567,7 +567,7 @@ $fields[] = array($label, $input, $hint); // append fields - $index .= Skin::build_box(i18n::s('More content'), Skin::build_form($fields), 'folder'); + $index .= Skin::build_box(i18n::s('More content'), Skin::build_form($fields), 'folded'); $fields = array(); // @@ -630,7 +630,7 @@ $fields[] = array($label, $input, $hint); // sub-categories - $content .= Skin::build_box(i18n::s('Sub-categories'), Skin::build_form($fields), 'folder'); + $content .= Skin::build_box(i18n::s('Sub-categories'), Skin::build_form($fields), 'folded'); $fields = array(); // excerpts @@ -674,7 +674,7 @@ $input .= '/> '.i18n::s('No, thank you to not handle excerpts for this category').' '; // excerpts - $content .= Skin::build_box(i18n::s('Excerpts'), $input, 'folder'); + $content .= Skin::build_box(i18n::s('Excerpts'), $input, 'folded'); } // @@ -759,8 +759,60 @@ $fields[] = array($label, $input, $hint); } + // associates can change the overlay --complex interface + if(Surfer::is_associate() && Surfer::has_all()) { + + // current type + $overlay_type = ''; + if(is_object($overlay)) + $overlay_type = $overlay->get_type(); + + // list overlays available on this system + $label = i18n::s('Change the overlay'); + $input = ''; + $fields[] = array($label, $input, $hint); + + // remember the overlay type + } elseif(is_object($overlay)) + $options .= ''; + // more options - $options .= Skin::build_box(i18n::s('More options'), Skin::build_form($fields), 'folder'); + $options .= Skin::build_box(i18n::s('More options'), Skin::build_form($fields), 'folded'); $fields = array(); // diff --git a/codes/basic.php b/codes/basic.php index 562c72b84..3fe1a125f 100644 --- a/codes/basic.php +++ b/codes/basic.php @@ -67,7 +67,7 @@ // **...** $context['text'] .= '[title]'.i18n::s('Wiki bold').' [escape]**...**[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is very **important**, isn\'t it?').'[/escape]' .''.i18n::s('This is very **important**, isn\'t it?').'' @@ -76,7 +76,7 @@ // [b]...[/b] $context['text'] .= '[title]'.i18n::s('Bold').' [escape][b]...[/b][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is very [b]important[/b], isn\'t it?').'[/escape]' .''.i18n::s('This is very [b]important[/b], isn\'t it?').'' @@ -84,7 +84,7 @@ // //...// $context['text'] .= '[title]'.i18n::s('Wiki italics').' [escape]//...//[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is really //meaningful//!').'[/escape]' .''.i18n::s('This is really //meaningful//!').'' @@ -92,7 +92,7 @@ // [i]...[/i] $context['text'] .= '[title]'.i18n::s('Italics').' [escape][i]...[/i][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is really [i]meaningful[/i]!').'[/escape]' .''.i18n::s('This is really [i]meaningful[/i]!').'' @@ -100,7 +100,7 @@ // __...__ $context['text'] .= '[title]'.i18n::s('Wiki underline').' [escape]__...__[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('I would like to __insist__ on this point...').'[/escape]' .''.i18n::s('I would like to __insist__ on this point...').'' @@ -108,7 +108,7 @@ // [u]...[/u] $context['text'] .= '[title]'.i18n::s('Underlined').' [escape][u]...[/u][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('I would like to [u]insist[/u] on this point...').'[/escape]' .''.i18n::s('I would like to [u]insist[/u] on this point...').'' @@ -116,7 +116,7 @@ // ##...## $context['text'] .= '[title]'.i18n::s('Wiki monospace').' [escape]##...##[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Type ##cwd ../foo/bar## to visit an interesting directory.').'[/escape]' .''.i18n::s('Type ##cwd ../foo/bar## to visit an interesting directory.').'' @@ -124,7 +124,7 @@ // [code]...[/code] $context['text'] .= '[title]'.i18n::s('Code').' [escape][code]...[/code][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Type [code]cwd ../foo/bar[/code] to visit an interesting directory.').'[/escape]' .''.i18n::s('Type [code]cwd ../foo/bar[/code] to visit an interesting directory.').'' @@ -132,7 +132,7 @@ // [color]...[/color] $context['text'] .= '[title]'.i18n::s('Color').' [escape][color]...[/color][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Here is some text in [color=red]red[/color] and some text in [color=green]green[/color]').'[/escape]' .''.i18n::s('Here is some text in [color=red]red[/color] and some text in [color=green]green[/color]').'' @@ -140,7 +140,7 @@ // [tiny]...[/tiny] $context['text'] .= '[title]'.i18n::s('Tiny').' [escape][tiny]...[/tiny][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is really [tiny]tiny![/tiny]').'[/escape]' .''.i18n::s('This is really [tiny]tiny![/tiny]').'' @@ -148,7 +148,7 @@ // [small]...[/small] $context['text'] .= '[title]'.i18n::s('Small').' [escape][small]...[/small][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is really [small]small![/small]').'[/escape]' .''.i18n::s('This is really [small]small![/small]').'' @@ -156,7 +156,7 @@ // [big]...[/big] $context['text'] .= '[title]'.i18n::s('Big').' [escape][big]...[/big][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This is really [big]meaningful[/big]').'[/escape]' .''.i18n::s('This is really [big]meaningful[/big]').'' @@ -164,7 +164,7 @@ // [huge]...[/huge] $context['text'] .= '[title]'.i18n::s('Huge').' [escape][huge]...[/huge][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('I would like to [huge]insist[/huge] on this point...').'[/escape]' .''.i18n::s('I would like to [huge]insist[/huge] on this point...').'' @@ -172,7 +172,7 @@ // [superscript]...[/superscript] $context['text'] .= '[title]'.i18n::s('Superscript').' [escape][superscript]...[/superscript][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text is [superscript]superscript[/superscript]. Interesting...').'[/escape]' .''.i18n::s('This text is [superscript]superscript[/superscript]. Interesting...').'' @@ -180,7 +180,7 @@ // [subscript]...[/subscript] $context['text'] .= '[title]'.i18n::s('Subscript').' [escape][subscript]...[/subscript][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text is [subscript]subscript[/subscript]. Interesting...').'[/escape]' .''.i18n::s('This text is [subscript]subscript[/subscript]. Interesting...').'' @@ -188,7 +188,7 @@ // ++...++ $context['text'] .= '[title]'.i18n::s('Wiki insertion').' [escape]++...++[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text ++has been inserted++.').'[/escape]' .''.i18n::s('This text ++has been inserted++.').'' @@ -196,7 +196,7 @@ // [inserted]...[/inserted] $context['text'] .= '[title]'.i18n::s('Inserted').' [escape][inserted]...[/inserted][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text [inserted]has been inserted[/inserted].').'[/escape]' .''.i18n::s('This text [inserted]has been inserted[/inserted].').'' @@ -204,7 +204,7 @@ // --...-- $context['text'] .= '[title]'.i18n::s('Wiki deletion').' [escape]--...--[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text --has been deleted--.').'[/escape]' .''.i18n::s('This text --has been deleted--.').'' @@ -212,7 +212,7 @@ // [deleted]...[/deleted] $context['text'] .= '[title]'.i18n::s('Deleted').' [escape][deleted]...[/deleted][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('This text [deleted]has been deleted[/deleted].').'[/escape]' .''.i18n::s('This text [deleted]has been deleted[/deleted].').'' @@ -220,7 +220,7 @@ // [flag]...[/flag] $context['text'] .= '[title]'.i18n::s('Flag').' [escape][flag]...[/flag][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('[flag]important![/flag] Don\'t forget to give something to your cat today.').'[/escape]' .''.i18n::s('[flag]important![/flag] Don\'t forget to give something to your cat today.').'' @@ -228,7 +228,7 @@ // [lang=xy]...[/lang] $context['text'] .= '[title]'.i18n::s('Language').' [escape][lang=xy]...[/lang][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][lang=en]This is in English[/lang][lang=fr]Ceci est en français[/lang][/escape]' .'[lang=en]This is in English[/lang][lang=fr]Ceci est en français[/lang]' @@ -236,7 +236,7 @@ // [style=serif]...[/style] $context['text'] .= '[title]'.i18n::s('Serif').' [escape][style=serif]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=serif]'.i18n::s('This text is in Serif.').'[/style][/escape]' .'[style=serif]'.i18n::s('This text is in Serif.').'[/style]' @@ -244,7 +244,7 @@ // [style=sans-serif]...[/style] $context['text'] .= '[title]'.i18n::s('Sans-Serif').' [escape][style=sans-serif]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=sans-serif]'.i18n::s('This text is in Sans-Serif.').'[/style][/escape]' .'[style=sans-serif]'.i18n::s('This text is in Sans-Serif.').'[/style]' @@ -252,7 +252,7 @@ // [style=cursive]...[/style] $context['text'] .= '[title]'.i18n::s('Cursive').' [escape][style=cursive]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=cursive]'.i18n::s('This text is in Cursive.').'[/style][/escape]' .'[style=cursive]'.i18n::s('This text is in Cursive.').'[/style]' @@ -260,7 +260,7 @@ // [style=fantasy]...[/style] $context['text'] .= '[title]'.i18n::s('Fantasy').' [escape][style=fantasy]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=fantasy]'.i18n::s('This text is in Fantasy.').'[/style][/escape]' .'[style=fantasy]'.i18n::s('This text is in Fantasy.').'[/style]' @@ -268,7 +268,7 @@ // [style=comic]...[/style] $context['text'] .= '[title]'.i18n::s('Comic').' [escape][style=comic]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=comic]'.i18n::s('This text is in Comic.').'[/style][/escape]' .'[style=comic]'.i18n::s('This text is in Comic.').'[/style]' @@ -276,7 +276,7 @@ // [style]...[/style] $context['text'] .= '[title]'.i18n::s('Use any style').' [escape][style=<style name>]...[/style][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][style=my_style]'.i18n::s('But where will this rabbit be in some minutes? I don\'t know, but it depends also on the turtle speed...').'[/style][/escape]' .'[style=my_style]'.i18n::s('But where will this rabbit be in some minutes? I don\'t know, but it depends also on the turtle speed...').'[/style]' diff --git a/codes/blocks.php b/codes/blocks.php index ffa4009a8..f7043a143 100644 --- a/codes/blocks.php +++ b/codes/blocks.php @@ -12,8 +12,10 @@ * - [php]...[/php] - a snippet of php * - [snippet]...[/snippet] - a snippet of fixed font data * - [quote]...[/quote] - a block of quoted text - * - [folder]...[/folder] - click to view its content, or to fold it away - * - [folder=foo bar]...[/folder] - with title 'foo bar' + * - [folded]...[/folded] - click to view its content, or to fold it away + * - [folded=foo bar]...[/folded] - with title 'foo bar' + * - [unfolded]...[/unfolded] - click to fold + * - [unfolded=foo bar]...[/unfolded] - with title 'foo bar' * - [sidebar]...[/sidebar] - a nice box aside * - [sidebar=foo bar]...[/sidebar] - with title 'foo bar' * - [scroller]...[/scroller] - some scrolling text @@ -54,7 +56,7 @@ // [indent]...[/indent] $context['text'] .= '[title]'.i18n::s('Indentation').' [escape][indent]...[/indent][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...')."\n" .'[indent]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/indent]'."\n" @@ -66,7 +68,7 @@ // [center]...[/center] $context['text'] .= '[title]'.i18n::s('Center').' [escape][center]...[/center][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][center]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/center][/escape]' .'[center]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/center]' @@ -74,7 +76,7 @@ // [right]...[/right] $context['text'] .= '[title]'.i18n::s('Right').' [escape][right]...[/right][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][right]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/right][/escape]' .'[right]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/right]' @@ -82,7 +84,7 @@ // [decorated]...[/decorated] $context['text'] .= '[title]'.i18n::s('Decorated').' [escape][decorated]...[/decorated][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][decorated]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/decorated]'."\n" .'[decorated]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/decorated]'."\n" @@ -94,7 +96,7 @@ // [caution]...[/caution] $context['text'] .= '[title]'.i18n::s('Caution').' [escape][caution]...[/caution][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][caution]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/caution][/escape]' .'[caution]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/caution]' @@ -102,7 +104,7 @@ // [note]...[/note] $context['text'] .= '[title]'.i18n::s('Note').' [escape][note]...[/note][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][note]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/note][/escape]' .'[note]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/note]' @@ -110,7 +112,7 @@ // [php]...[/php] $context['text'] .= '[title]'.i18n::s('PHP snippet').' [escape][php]...[/php][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A snippet of load_skin(), from global.php:')."\n" .'[php]'."\n" @@ -146,7 +148,7 @@ // [snippet]...[/snippet] $context['text'] .= '[title]'.i18n::s('Pre-formatted').' [escape][snippet]...[/snippet][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Let assume a standard HTTP request to get it, such as the next one, which has 382 bytes:')."\n" .'[snippet]'."\n" @@ -172,31 +174,47 @@ // [quote]...[/quote] $context['text'] .= '[title]'.i18n::s('Quote').' [escape][quote]...[/quote][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][quote]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/quote][/escape]' .'[quote]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/quote]' .Skin::table_suffix(); -// [folder]...[/folder] -$context['text'] .= '[title]'.i18n::s('Folder').' [escape][folder]...[/folder][/escape][/title]' - .Skin::table_prefix('100%') +// [folded]...[/folded] +$context['text'] .= '[title]'.i18n::s('Folded').' [escape][folded]...[/folded][/escape][/title]' + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') - .'[escape][folder]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folder][/escape]' - .'[folder]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folder]' + .'[escape][folded]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folded][/escape]' + .'[folded]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folded]' .Skin::table_suffix(); -// [folder=...]...[/folder] -$context['text'] .= '[title]'.i18n::s('Folder with title').' [escape][folder=<title>]...[/folder][/escape][/title]' - .Skin::table_prefix('100%') +// [folded=...]...[/folded] +$context['text'] .= '[title]'.i18n::s('Folded with title').' [escape][folded=<title>]...[/folded][/escape][/title]' + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') - .'[escape][folder='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folder][/escape]' - .'[folder='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folder]' + .'[escape][folded='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folded][/escape]' + .'[folded='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/folded]' + .Skin::table_suffix(); + +// [unfolded]...[/unfolded] +$context['text'] .= '[title]'.i18n::s('Unfolded').' [escape][unfolded]...[/unfolded][/escape][/title]' + .Skin::table_prefix('wide grid') + .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') + .'[escape][unfolded]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/unfolded][/escape]' + .'[unfolded]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/unfolded]' + .Skin::table_suffix(); + +// [unfolded=...]...[/unfolded] +$context['text'] .= '[title]'.i18n::s('Unfolded with title').' [escape][unfolded=<title>]...[/unfolded][/escape][/title]' + .Skin::table_prefix('wide grid') + .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') + .'[escape][unfolded='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/unfolded][/escape]' + .'[unfolded='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/unfolded]' .Skin::table_suffix(); // [sidebar]...[/sidebar] $context['text'] .= '[title]'.i18n::s('Sidebar').' [escape][sidebar]...[/sidebar][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][sidebar]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/sidebar][/escape]' .'[sidebar]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/sidebar]' @@ -204,7 +222,7 @@ // [sidebar=...]...[/sidebar] $context['text'] .= '[title]'.i18n::s('Sidebar with title').' [escape][sidebar=<title>]...[/sidebar][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][sidebar='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/sidebar][/escape]' .'[sidebar='.i18n::s('A Rabbit Story').']'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/sidebar]' @@ -212,7 +230,7 @@ // [scroller]...[/scroller] $context['text'] .= '[title]'.i18n::s('Scroller').' [escape][scroller]...[/scroller][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][scroller]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/scroller][/escape]' .'[scroller]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/scroller]' diff --git a/codes/links.php b/codes/links.php index 474b0fe5d..dc47c140f 100644 --- a/codes/links.php +++ b/codes/links.php @@ -96,7 +96,7 @@ // url $context['text'] .= '[title]'.i18n::s('External link').' [escape]<url>[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit www.cisco.com or http://www.nortel.com, or have a chat at irc://irc.eu.be.ofloo.net/').'[/escape]' .''.i18n::s('You can visit www.cisco.com or http://www.nortel.com, or have a chat at irc://irc.eu.be.ofloo.net/').'' @@ -104,7 +104,7 @@ // [link]url[/link] - external $context['text'] .= '[title]'.i18n::s('External link').' [escape][link]<url>[/link][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit [link]www.cisco.com[/link] or [link]http://www.nortel.com[/link], or have a chat at [link]irc://irc.eu.be.ofloo.net/[/link]').'[/escape]' .''.i18n::s('You can visit [link]www.cisco.com[/link] or [link]http://www.nortel.com[/link], or have a chat at [link]irc://irc.eu.be.ofloo.net/[/link]').'' @@ -112,7 +112,7 @@ // [link]url[/link] - internal $context['text'] .= '[title]'.i18n::s('Internal link').' [escape][link]<url>[/link][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit [link]codes/basic.php[/link] or [link]index.php[/link]').'[/escape]' .''.i18n::s('You can visit [link]codes/basic.php[/link] or [link]index.php[/link]').'' @@ -120,7 +120,7 @@ // [label|url] $context['text'] .= '[title]'.i18n::s('Labelled link').' [escape][<label>|<url>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit [Cisco On Line|www.cisco.com]').'[/escape]' .''.i18n::s('You can visit [Cisco On Line|www.cisco.com]').'' @@ -128,7 +128,7 @@ // [link=label]url[/link] $context['text'] .= '[title]'.i18n::s('Labelled link').' [escape][link=<label>]<url>[/link][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit [link=Cisco On Line]www.cisco.com[/link]').'[/escape]' .''.i18n::s('You can visit [link=Cisco On Line]www.cisco.com[/link]').'' @@ -136,7 +136,7 @@ // [button=label]url[/button] $context['text'] .= '[title]'.i18n::s('Labelled button').' [escape][button=<label>]<url>[/button][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can visit [button=Cisco On Line]www.cisco.com[/button]').'[/escape]' .''.i18n::s('You can visit [button=Cisco On Line]www.cisco.com[/button]').'' @@ -144,7 +144,7 @@ // address $context['text'] .= '[title]'.i18n::s('e-mail address').' [escape]<address>[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can send a message at webmaster@acme.com').'[/escape]' .''.i18n::s('You can send a message at webmaster@acme.com').'' @@ -152,7 +152,7 @@ // [email]address[/email] $context['text'] .= '[title]'.i18n::s('e-mail address').' [escape][email]<address>[/email][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can send a message at [email]webmaster@acme.com[/email]').'[/escape]' .''.i18n::s('You can send a message at [email]webmaster@acme.com[/email]').'' @@ -160,7 +160,7 @@ // [email=label]address[/email] $context['text'] .= '[title]'.i18n::s('Labelled e-mail address').' [escape][email=<label>]<address>[/email][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can send a message to our [email=support team]webmaster@acme.com[/email]').'[/escape]' .''.i18n::s('You can send a message to our [email=support team]webmaster@acme.com[/email]').'' @@ -168,7 +168,7 @@ // [go=monthly, monthly archive] $context['text'] .= '[title]'.i18n::s('Selector').' [escape][go=<name>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Please use our [go=monthly, monthly archive] for reference').'[/escape]' .''.i18n::s('Please use our [go=monthly, monthly archive] for reference').'' @@ -176,7 +176,7 @@ // [article=id] $context['text'] .= '[title]'.i18n::s('Page shortcut').' [escape][article=<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[article='.$article_id.']').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[article='.$article_id.']').'' @@ -184,7 +184,7 @@ // [article=id, label] $context['text'] .= '[title]'.i18n::s('Page shortcut').' [escape][article=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[article='.$article_id.', bla bla bla]').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[article='.$article_id.', bla bla bla]').'' @@ -192,7 +192,7 @@ // [article.description=id] $context['text'] .= '[title]'.i18n::s('Page').' [escape][article.description=<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][article.description='.$article_id.'][/escape]' .'[article.description='.$article_id.']' @@ -200,7 +200,7 @@ // [previous=id] $context['text'] .= '[title]'.i18n::s('Previous page').' [escape][previous=<id>] [previous=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][previous='.$article_id.'][/escape]' .'[previous='.$article_id.']' @@ -208,7 +208,7 @@ // [next=id] $context['text'] .= '[title]'.i18n::s('Next page').' [escape][next=<id>] [next=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][next='.$article_id.'][/escape]' .'[next='.$article_id.']' @@ -216,7 +216,7 @@ // [random=section:id] $context['text'] .= '[title]'.i18n::s('Random').' [escape][random] [random=section:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][random] [random=section:'.$section_id.'][/escape]' .'[random] [random=section:'.$section_id.']' @@ -224,7 +224,7 @@ // [section=id] $context['text'] .= '[title]'.i18n::s('Section shortcut').' [escape][section=<id>] [section=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[section='.$section_id.']').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[section='.$section_id.']').'' @@ -232,7 +232,7 @@ // [category=id] $context['text'] .= '[title]'.i18n::s('Category shortcut').' [escape][category=<id>] [category=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[category=featured]').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[category=featured]').'' @@ -240,7 +240,7 @@ // [category.description=id] $context['text'] .= '[title]'.i18n::s('Category').' [escape][category.description=<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][category.description=featured][/escape]' .'[category.description=featured]' @@ -248,7 +248,7 @@ // [user=id] $context['text'] .= '[title]'.i18n::s('User shortcut').' [escape][user=<id>] [user=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[user='.Surfer::get_id().']').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[user='.Surfer::get_id().']').'' @@ -256,7 +256,7 @@ // [server=id] $context['text'] .= '[title]'.i18n::s('Server shortcut').' [escape][server=<id>] [server=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Click to view the page of [server=2, this server]').'[/escape]' .''.i18n::s('Click to view the page of [server=2, this server]').'' @@ -264,7 +264,7 @@ // [file=id] $context['text'] .= '[title]'.i18n::s('File shortcut').' [escape][file=<id>] [file=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Have a look at %s'), '[file='.$file_id.']').'[/escape]' .''.sprintf(i18n::s('Have a look at %s'), '[file='.$file_id.']').'' @@ -272,7 +272,7 @@ // [download=id] $context['text'] .= '[title]'.i18n::s('Download shortcut').' [escape][download=<id>] [download=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.sprintf(i18n::s('Click to %s'), '[download='.$file_id.', '.i18n::s('download the file').']').'[/escape]' .''.sprintf(i18n::s('Click to %s'), '[download='.$file_id.', '.i18n::s('download the file').']').'' @@ -280,7 +280,7 @@ // [action=id] $context['text'] .= '[title]'.i18n::s('Action shortcut').' [escape][action=<id>] [action=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Click to view the page of [action=2, this action]').'[/escape]' .''.i18n::s('Click to view the page of [action=2, this action]').'' @@ -288,7 +288,7 @@ // [comment=id] $context['text'] .= '[title]'.i18n::s('Comment shortcut').' [escape][comment=<id>] [comment=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Click to view the page of [comment=2, this comment]').'[/escape]' .''.i18n::s('Click to view the page of [comment=2, this comment]').'' @@ -296,7 +296,7 @@ // [decision=id] $context['text'] .= '[title]'.i18n::s('Decision shortcut').' [escape][decision=<id>] [decision=<id>, <label>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Click to view the page of [decision=2, this decision]').'[/escape]' .''.i18n::s('Click to view the page of [decision=2, this decision]').'' @@ -304,7 +304,7 @@ // [script]index.php[/script] $context['text'] .= '[title]'.i18n::s('Script shortcut').' [escape][script]<path/script.php>[/script][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('You can access the documentation for the script [script]shared/codes.php[/script]').'[/escape]' .''.i18n::s('You can access the documentation for the script [script]shared/codes.php[/script]').'' @@ -312,7 +312,7 @@ // [search=yacs] $context['text'] .= '[title]'.i18n::s('Search').' [escape][search] [search=<words>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('All you want to know on [search=yacs]').'[/escape]' .''.i18n::s('All you want to know on [search=yacs]').'' @@ -320,7 +320,7 @@ // [wikipedia=keyword, label] $context['text'] .= '[title]'.i18n::s('Wikipedia').' [escape][wikipedia=keyword] [wikipedia=keyword, label][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('All you want to know on [wikipedia=Web_2, the web 2.0]').'[/escape]' .''.i18n::s('All you want to know on [wikipedia=Web_2, the web 2.0]').'' diff --git a/codes/lists.php b/codes/lists.php index ef33b690c..d046d033a 100644 --- a/codes/lists.php +++ b/codes/lists.php @@ -48,7 +48,7 @@ // [*] $context['text'] .= '[title]'.i18n::s('List item').' [escape][*][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A simple list:')."\n\n".'[*]'.i18n::s('First item')."\n\n".'[*]'.i18n::s('Second item (after one empty line)')."\n".'[*]'.i18n::s('Third item (next the previous one)').'[/escape]' .''.i18n::s('A simple list:')."\n\n".'[*]'.i18n::s('First item')."\n\n".'[*]'.i18n::s('Second item (after one empty line)')."\n".'[*]'.i18n::s('Third item (next the previous one)').'' @@ -56,7 +56,7 @@ // [list]...[/list] $context['text'] .= '[title]'.i18n::s('Bulleted list').' [escape][list]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A list with bulleted items:')."\n".'[list]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('A list with bulleted items:')."\n".'[list]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' @@ -64,7 +64,7 @@ // [list=1]...[/list] $context['text'] .= '[title]'.i18n::s('Numbered list').' [escape][list=1]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A list with numbered items:')."\n".'[list=1]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('A list with numbered items:')."\n".'[list=1]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' @@ -72,7 +72,7 @@ // [list=a]...[/list] $context['text'] .= '[title]'.i18n::s('Numbered list').' [escape][list=a]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A list with alphabetically numbered items:')."\n".'[list=a]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('A list with alphabetically numbered items:')."\n".'[list=a]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' @@ -80,7 +80,7 @@ // [list=A]...[/list] $context['text'] .= '[title]'.i18n::s('Numbered list').' [escape][list=A]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Another list with alphabetically numbered items:')."\n".'[list=A]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('Another list with alphabetically numbered items:')."\n".'[list=A]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' @@ -88,7 +88,7 @@ // [list=i]...[/list] $context['text'] .= '[title]'.i18n::s('Numbered list').' [escape][list=i]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('A list with roman numbers:')."\n".'[list=i]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('A list with roman numbers:')."\n".'[list=i]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' @@ -96,7 +96,7 @@ // [list=I]...[/list] $context['text'] .= '[title]'.i18n::s('Numbered list').' [escape][list=I]...[/list][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Another list with roman numbers:')."\n".'[list=I]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list][/escape]' .''.i18n::s('Another list with roman numbers:')."\n".'[list=I]'."\n".'[*]'.i18n::s('First item')."\n".'[*]'.i18n::s('Second item')."\n".'[/list]' diff --git a/codes/live.php b/codes/live.php index 040af0e99..42b3bfae9 100644 --- a/codes/live.php +++ b/codes/live.php @@ -77,7 +77,7 @@ // [sections] $context['text'] .= '[title]'.i18n::s('Sections').' [escape][sections] [sections=section:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][sections][/escape]' .'[sections]' @@ -85,7 +85,7 @@ // [sections=self] $context['text'] .= '[title]'.i18n::s('Assigned sections').' [escape][sections=self] [sections=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][sections.folded=self][/escape]' .'[sections.folded=self]' @@ -94,7 +94,7 @@ // [freemind] $context['text'] .= '[title]'.i18n::s('A dynamic Freemind map').' [escape][freemind] [freemind=section:<id>][/escape][/title]' .'

'.i18n::s('Use the simplest form to navigate site content is a mind map, or limit the scope to one section and related sub-sections.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][freemind=section:default, 100%, 300px][/escape]' .'[freemind=section:default, 100%, 300px]' @@ -102,7 +102,7 @@ // [categories] $context['text'] .= '[title]'.i18n::s('Categories').' [escape][categories] [categories=category:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][categories][/escape]' .'[categories]' @@ -110,7 +110,7 @@ // [categories=self] $context['text'] .= '[title]'.i18n::s('Assigned categories').' [escape][categories=self] [categories=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][categories=self][/escape]' .'[categories=self]' @@ -119,7 +119,7 @@ // [cloud] $context['text'] .= '[title]'.i18n::s('Cloud of tags').' [escape][cloud] [cloud=<40>][/escape][/title]' .'

'.i18n::s('Use the parameter to adjust the number of tags listed.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][cloud][/escape]' .'[cloud]' @@ -128,7 +128,7 @@ // [published] $context['text'] .= '[title]'.i18n::s('Recent pages').' [escape][published] [published=section:<id>] [published=category:<id>][/escape][/title]' .'

'.i18n::s('Use the simplest form to display a compact list of pages, or limit the scope.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][published.decorated][/escape]' .'[published.decorated]' @@ -136,7 +136,7 @@ // [published=self] $context['text'] .= '[title]'.i18n::s('Personal pages').' [escape][published=self] [published=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][published=self, 20][/escape]' .'[published=self, 20]' @@ -145,7 +145,7 @@ // [updated] $context['text'] .= '[title]'.i18n::s('Recent updates').' [escape][updated] [updated=section:<id>] [updated=category:<id>][/escape][/title]' .'

'.i18n::s('Use the simplest form to display a compact list of pages, or limit the scope.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][updated.timeline][/escape]' .'[updated.timeline]' @@ -153,7 +153,7 @@ // [updated=self] $context['text'] .= '[title]'.i18n::s('Personal updates').' [escape][updated=self] [updated=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][updated=self, 12][/escape]' .'[updated=self, 12]' @@ -162,7 +162,7 @@ // [read] $context['text'] .= '[title]'.i18n::s('Hall of fame').' [escape][read] [read=section:<id>][/escape][/title]' .'

'.i18n::s('Use the simplest form to display a compact list of pages, or limit the scope.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][read][/escape]' .'[read]' @@ -170,7 +170,7 @@ // [read=self] $context['text'] .= '[title]'.i18n::s('Personal hits').' [escape][read=self] [read=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][read=self][/escape]' .'[read=self]' @@ -179,7 +179,7 @@ // [voted] $context['text'] .= '[title]'.i18n::s('Hall of fame').' [escape][voted] [voted=section:<id>][/escape][/title]' .'

'.i18n::s('Use the simplest form to display a compact list of pages, or limit the scope.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][voted][/escape]' .'[voted]' @@ -187,7 +187,7 @@ // [voted=self] $context['text'] .= '[title]'.i18n::s('Personal hits').' [escape][voted=self] [voted=user:<id>][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][voted=self][/escape]' .'[voted=self]' @@ -195,7 +195,7 @@ // [calendar] $context['text'] .= '[title]'.i18n::s('Events').' [escape][calendar][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][calendar][/escape]' .'[calendar]' @@ -203,7 +203,7 @@ // [location=latitude, longitude, label] $context['text'] .= '[title]'.i18n::s('Direct location').' [escape][location=latitude, longitude, label][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][location=48.871264, 2.307558, Paris][/escape]' .'[location=48.871264, 2.307558, Paris]' @@ -212,7 +212,7 @@ // [collections] $context['text'] .= '[title]'.i18n::s('Collections').' [escape][collections][/escape][/title]' .'

'.i18n::s('Use the configuration panel for collections to create new collections of files.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][collections][/escape]' .'[collections]' @@ -220,7 +220,7 @@ // [users=present] $context['text'] .= '[title]'.i18n::s('Present users').' [escape][users=present][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][users=present][/escape]' .'[users=present]' diff --git a/codes/misc.php b/codes/misc.php index 7d1579f93..f9bffff09 100644 --- a/codes/misc.php +++ b/codes/misc.php @@ -61,7 +61,7 @@ // implicit formating $context['text'] .= '[title]'.i18n::s('Implicit formatting').'[/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('hello')."\n" .i18n::s('world')."\n" @@ -105,7 +105,7 @@ // [hint=help]...[/hint] $context['text'] .= '[title]'.i18n::s('Hint').' [escape][hint=<help popup>]...[/hint][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('YACS is based on international standards, including [hint=eXtended Markup Language]XML[/hint].').'[/escape]' .''.i18n::s('YACS is based on international standards, including [hint=eXtended Markup Language]XML[/hint].').'' @@ -113,7 +113,7 @@ // [nl] $context['text'] .= '[title]'.i18n::s('Newline').' [escape]...[nl]...[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape]' .''.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'' @@ -121,7 +121,7 @@ // [---] $context['text'] .= '[title]'.i18n::s('Ruler').' [escape]...[---] or [___]...[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[---]I don\'t know, but it depends also on the turtle speed...').'[/escape]' .''.i18n::s('But where will this rabbit be in some minutes?[---]I don\'t know, but it depends also on the turtle speed...').'' @@ -129,7 +129,7 @@ // [new] $context['text'] .= '[title]'.i18n::s('New').' [escape]...[new]...[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Our newsletter has been published!').' [new][/escape]' .''.i18n::s('Our newsletter has been published!').' [new]' @@ -137,7 +137,7 @@ // [popular] $context['text'] .= '[title]'.i18n::s('Popular').' [escape]...[popular]...[/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('Numerous surfers like this section of our site').' [popular][/escape]' .''.i18n::s('Numerous surfers like this section of our site').' [popular]' @@ -145,7 +145,7 @@ // flags $context['text'] .= '[title]'.i18n::s('Flags').' [escape][be] [ca] [ch] [de] [en] [es] [fr] [gb] [gr] [it] [pt] [us][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][be] [ca] [ch] [de] [en] [es] [fr] [gb] [gr] [it] [pt] [us][/escape]' .'[be] [ca] [ch] [de] [en] [es] [fr] [gb] [gr] [it] [pt] [us]' diff --git a/codes/tables.php b/codes/tables.php index 42bf67a43..9b71548bf 100644 --- a/codes/tables.php +++ b/codes/tables.php @@ -47,7 +47,7 @@ // [table]...[/table] $context['text'] .= '[title]'.i18n::s('Table').' [escape][table]...[/table][/escape][/title]' .'

'.i18n::s('In this example cells are separated by tabulation characters or by 2 spaces.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table]'."\n" .i18n::s('Rabbit')."\t".i18n::s('Turtle')."\n" @@ -62,7 +62,7 @@ // [table=grid]...[/table] $context['text'] .= '[title]'.i18n::s('Table').' [escape][table=grid]...[/table][/escape][/title]' .'

'.i18n::s('In this example cells are separated by the | character.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=grid]'."\n" .i18n::s('Rabbit|Turtle')."\n" @@ -77,7 +77,7 @@ // [table=tiny]...[/table] $context['text'] .= '[title]'.i18n::s('Table').' [escape][table=tiny]...[/table][/escape][/title]' .'

Actually any style can be applied to the generated table.

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=tiny]'."\n" .i18n::s('Rabbit|Turtle')."\n" @@ -91,7 +91,7 @@ // [table]...[body]...[/table] $context['text'] .= '[title]'.i18n::s('Separate headers from the body').' [escape][table]...[body]...[/table][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=grid]'."\n" .i18n::s('First Name|Last Name')."\n" @@ -109,7 +109,7 @@ // cells alignment $context['text'] .= '[title]'.i18n::s('Explicit cells alignment').'[/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=grid]'."\n" .'left='.i18n::s('Full Name').'| center='.i18n::s('Birth Year').'| right='.i18n::s('Net income')."\n" @@ -127,7 +127,7 @@ // [table]...[csv]...[/csv]...[/table] $context['text'] .= '[title]'.i18n::s('Comma-separated values').' [escape][table][csv]...[/csv][/table][/escape][/title]' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=grid]'."\n" .'[csv]'."\n" @@ -148,7 +148,7 @@ // [table]...[csv=;]...[/csv]...[/table] $context['text'] .= '[title]'.i18n::s('Comma-separated values').' [escape][table][csv=;]...[/csv][/table][/escape][/title]' .'

'.i18n::s('Using a different separator between cells.').'

' - .Skin::table_prefix('100%') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][table=grid]'."\n" .'[csv=;]'."\n" diff --git a/codes/titles.php b/codes/titles.php index d58036f68..25f554b8d 100644 --- a/codes/titles.php +++ b/codes/titles.php @@ -58,7 +58,7 @@ // [toc] $context['text'] .= '[title]'.i18n::s('Table of content').' [escape][toc][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][toc][/escape]' .'[toc]' @@ -66,7 +66,7 @@ // [title]...[/title] $context['text'] .= '[title]'.i18n::s('Title').' [escape][title]...[/title][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][title]'.i18n::s('Rabbit and Turtle').'[/title][/escape][nl]' @@ -78,7 +78,7 @@ // [subtitle]...[/subtitle] $context['text'] .= '[title]'.i18n::s('Subtitle').' [escape][subtitle]...[/subtitle][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][subtitle]'.i18n::s('Rabbit and Turtle').'[/subtitle][/escape][nl]' @@ -90,7 +90,7 @@ // ==...== $context['text'] .= '[title]'.i18n::s('Header level 1').' [escape]==...==[/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl]' .'[escape]=='.i18n::s('Rabbit and Turtle').'==[/escape][nl]' @@ -102,7 +102,7 @@ // [header1]...[/header1] $context['text'] .= '[title]'.i18n::s('Header level 1').' [escape][header1]...[/header1][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][header1]'.i18n::s('Rabbit and Turtle').'[/header1][/escape][nl]' @@ -114,7 +114,7 @@ // ===...=== $context['text'] .= '[title]'.i18n::s('Header level 2').' [escape]===...===[/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl]' .'[escape]==='.i18n::s('Rabbit and Turtle').'===[/escape][nl]' @@ -126,7 +126,7 @@ // [header2]...[/header2] $context['text'] .= '[title]'.i18n::s('Header level 2').' [escape][header2]...[/header2][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][header2]'.i18n::s('Rabbit and Turtle').'[/header2][/escape][nl]' @@ -138,7 +138,7 @@ // ====...==== $context['text'] .= '[title]'.i18n::s('Header level 3').' [escape]====...====[/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl]' .'[escape]===='.i18n::s('Rabbit and Turtle').'====[/escape][nl]' @@ -150,7 +150,7 @@ // [header3]...[/header3] $context['text'] .= '[title]'.i18n::s('Header level 3').' [escape][header3]...[/header3][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][header3]'.i18n::s('Rabbit and Turtle').'[/header3][/escape][nl]' @@ -162,7 +162,7 @@ // =====...===== $context['text'] .= '[title]'.i18n::s('Header level 4').' [escape]=====...=====[/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl]' .'[escape]====='.i18n::s('Rabbit and Turtle').'=====[/escape][nl]' @@ -174,7 +174,7 @@ // [header4]...[/header4] $context['text'] .= '[title]'.i18n::s('Header level 4').' [escape][header4]...[/header4][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][header4]'.i18n::s('Rabbit and Turtle').'[/header4][/escape][nl]' @@ -186,7 +186,7 @@ // ======...====== $context['text'] .= '[title]'.i18n::s('Header level 5').' [escape]======...======[/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl]' .'[escape]======'.i18n::s('Rabbit and Turtle').'======[/escape][nl]' @@ -198,7 +198,7 @@ // [header5]...[/header5] $context['text'] .= '[title]'.i18n::s('Header level 5').' [escape][header5]...[/header5][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape]'.i18n::s('But where will this rabbit be in some minutes?[nl]I don\'t know, but it depends also on the turtle speed...').'[/escape][nl][nl]' .'[escape][header5]'.i18n::s('Rabbit and Turtle').'[/header5][/escape][nl]' @@ -210,7 +210,7 @@ // [toq] $context['text'] .= '[title]'.i18n::s('Table of Questions').' [escape][toq][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][toq][/escape]' .'[toq]' @@ -218,7 +218,7 @@ // [question]...[/question] $context['text'] .= '[title]'.i18n::s('Question-title').' [escape][question]...[/question][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][question]'.i18n::s('But where will this rabbit be in some minutes?').'[/question][/escape]' .'[question]'.i18n::s('But where will this rabbit be in some minutes?').'[/question]' @@ -226,7 +226,7 @@ // [question] $context['text'] .= '[title]'.i18n::s('Question').' [escape][question][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][question]'.i18n::s('But where is this rabbit right now?').'[/escape]' .'[question]'.i18n::s('But where is this rabbit right now?').'' @@ -234,7 +234,7 @@ // [answer] $context['text'] .= '[title]'.i18n::s('Answer').' [escape][answer][/escape][/title]' - .Skin::table_prefix('wide') + .Skin::table_prefix('wide grid') .Skin::table_row(array(i18n::s('Example'), i18n::s('Rendering')), 'header') .'[escape][answer]'.i18n::s('I do not know, but it depends also on the turtle speed...').'[/escape]' .'[answer]'.i18n::s('I do not know, but it depends also on the turtle speed...').'' diff --git a/collections/configure.php b/collections/configure.php index 498621187..7821a909e 100644 --- a/collections/configure.php +++ b/collections/configure.php @@ -294,7 +294,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folded'); // follow-up commands $follow_up = i18n::s('Where do you want to go now?'); diff --git a/configure.php b/configure.php index 669b1ed84..7fb7551d4 100644 --- a/configure.php +++ b/configure.php @@ -639,7 +639,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folded'); // first installation if(!file_exists('parameters/switch.on') && !file_exists('parameters/switch.off')) { diff --git a/control/configure.php b/control/configure.php index 9766d8564..89dd1d367 100644 --- a/control/configure.php +++ b/control/configure.php @@ -333,7 +333,7 @@ $fields = array(); // in a folded box - $database .= Skin::build_box(i18n::s('Custom storage of user information'), $text, 'folder'); + $database .= Skin::build_box(i18n::s('Custom storage of user information'), $text, 'folded'); // // system parameters @@ -562,7 +562,7 @@ $fields[] = array($label, $input); // build the form - $http .= Skin::build_box(i18n::s('Proxy settings'), Skin::build_form($fields), 'folder'); + $http .= Skin::build_box(i18n::s('Proxy settings'), Skin::build_form($fields), 'folded'); $fields = array(); // @@ -908,7 +908,7 @@ // display updated parameters if(is_callable(array('skin', 'build_box'))) - $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folded'); else $context['text'] .= Safe::highlight_string($content); diff --git a/control/htaccess/index.php b/control/htaccess/index.php index 891f5d75a..22d6e3e30 100644 --- a/control/htaccess/index.php +++ b/control/htaccess/index.php @@ -86,7 +86,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), str_replace("\n", BR, htmlspecialchars($content)), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), str_replace("\n", BR, htmlspecialchars($content)), 'folded'); // follow-up commands $follow_up = i18n::s('Where do you want to go now?'); diff --git a/control/index.php b/control/index.php index 136e80fba..88a4cb3db 100644 --- a/control/index.php +++ b/control/index.php @@ -221,8 +221,8 @@ $text = '

'.i18n::s('The following table reports on current content of this server. Click on any link to get more details.').'

'; // use a neat table for the layout - $text .= Skin::table_prefix(''); - $text .= Skin::table_row(array(i18n::s('Table'), i18n::s('Records'), 'center='.i18n::s('First record'), 'center='.i18n::s('Last record')), 'header'); + $text .= Skin::table_prefix('wide grid'); + $text .= Skin::table_row(array(i18n::s('Table'), 'center='.i18n::s('Records'), 'center='.i18n::s('First record'), 'center='.i18n::s('Last record')), 'header'); $lines = 2; // actions @@ -649,7 +649,7 @@ function get_size($size){ $commands[] = sprintf(i18n::s('%s - smileys available for your posts'), Skin::build_link('smileys/', i18n::s('Smileys'), 'basic')); // avatars - $commands[] = sprintf(i18n::s('%s - some avatars you may choose for your user profile'), Skin::build_link('skins/images/avatars/', i18n::s('Avatars'), 'basic')); + $commands[] = sprintf(i18n::s('%s - some avatars you may choose for your profile'), Skin::build_link('skins/images/avatars/', i18n::s('Avatars'), 'basic')); // usage information if(Surfer::is_associate()) diff --git a/control/info.php b/control/info.php index e2cbb793d..5ddc67863 100644 --- a/control/info.php +++ b/control/info.php @@ -156,7 +156,7 @@ } $content .= "\n"; } - $context['text'] .= Skin::build_box(i18n::s('SQL status'), $content, 'folder'); + $context['text'] .= Skin::build_box(i18n::s('SQL status'), $content, 'folded'); // 'SHOW VARIABLES' $query = "SHOW VARIABLES"; @@ -169,7 +169,7 @@ } $content .= "\n"; } - $context['text'] .= Skin::build_box(i18n::s('SQL variables'), $content, 'folder'); + $context['text'] .= Skin::build_box(i18n::s('SQL variables'), $content, 'folded'); // 'SHOW CHARACTER SET' $query = "SHOW CHARACTER SET"; @@ -182,7 +182,7 @@ } $content .= "\n"; } - $context['text'] .= Skin::build_box(i18n::s('Supported charsets'), $content, 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Supported charsets'), $content, 'folded'); break; diff --git a/control/populate.php b/control/populate.php index 5ce417877..2ece8f082 100644 --- a/control/populate.php +++ b/control/populate.php @@ -230,7 +230,7 @@ if(!file_exists('../parameters/switch.on') && !file_exists('../parameters/switch.off')) $context['text'] .= Skin::build_block(i18n::s('Users'), 'subtitle'); - $context['text'] .= '

'.sprintf(i18n::s('Congratulations, one associate profile %s has been created with the password %s'), $user['nick_name'], $_REQUEST['password'])."

\n"; + $context['text'] .= '

'.sprintf(i18n::s('One associate profile "%s" has been created.'), $user['nick_name'])."

\n"; // impersonate the new created user profile on first installation if(!file_exists('../parameters/switch.on') && !file_exists('../parameters/switch.off')) diff --git a/control/purge.php b/control/purge.php index 63029c212..c49726e03 100644 --- a/control/purge.php +++ b/control/purge.php @@ -81,7 +81,7 @@ function delete_backup($path) { global $context; - $path_translated = str_replace('//', '/', $context['path_to_root'].'/'.$path); + $path_translated = $context['path_to_root'].$path; if($handle = Safe::opendir($path_translated)) { while(($node = Safe::readdir($handle)) !== FALSE) { @@ -94,7 +94,7 @@ function delete_backup($path) { $target_translated = str_replace('//', '/', $path_translated.'/'.$node); // delete a sub directory - if(is_dir($target_translated)) + if(is_dir($target_translated) && !strpos($path_translated, '/files/') && !strpos($path_translated, '/images/')) delete_backup($target); // delete a backed up file diff --git a/control/scan.php b/control/scan.php index 831337a0d..a1d693b4a 100644 --- a/control/scan.php +++ b/control/scan.php @@ -201,7 +201,7 @@ function include_hook($path) { $context['text'] .= sprintf(i18n::s('Hook %s has been included'), $actual_item).BR."\n"; // scan any sub dir except at server root - } elseif(is_dir($actual_item) && ($path != $context['path_to_root']) && !strpos($path, '/files/')) + } elseif(is_dir($actual_item) && ($path != $context['path_to_root']) && !strpos($path, '/files/') && !strpos($path, '/images/')) include_hook($actual_item); } @@ -828,7 +828,7 @@ function include_hook($path) { // display the existing hooks configuration file, if any $content = Safe::file_get_contents('../parameters/hooks.include.php'); if(strlen($content)) { - $context['text'] .= Skin::build_box(sprintf(i18n::s('Current content of %s'), 'parameters/hooks.include.php'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(sprintf(i18n::s('Current content of %s'), 'parameters/hooks.include.php'), Safe::highlight_string($content), 'folded'); } diff --git a/control/switch.php b/control/switch.php index 8719c2307..bdf2a5ab2 100644 --- a/control/switch.php +++ b/control/switch.php @@ -104,7 +104,7 @@ $context['text'] .= '

'.sprintf(i18n::s('To actually change the configuration, please copy and paste following lines by yourself in file %s.'), 'parameters/switch.include.php')."

\n"; // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folded'); } diff --git a/control/virtual.php b/control/virtual.php index ff7607daf..b2054dd95 100644 --- a/control/virtual.php +++ b/control/virtual.php @@ -186,7 +186,7 @@ // display its content elseif(file_exists('../parameters/switch.on') || file_exists('../parameters/switch.off')) - $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration'), Safe::highlight_string($content), 'folded'); else $context['text'] .= Safe::highlight_string($content); diff --git a/feeds/configure.php b/feeds/configure.php index 26f01a666..98c0cdb9b 100644 --- a/feeds/configure.php +++ b/feeds/configure.php @@ -283,7 +283,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folded'); // follow-up commands $follow_up = i18n::s('Where do you want to go now?'); diff --git a/feeds/flash/configure.php b/feeds/flash/configure.php index 028aed190..c592827b8 100644 --- a/feeds/flash/configure.php +++ b/feeds/flash/configure.php @@ -239,7 +239,7 @@ } // display updated parameters - $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folder'); + $context['text'] .= Skin::build_box(i18n::s('Configuration parameters'), Safe::highlight_string($content), 'folded'); // follow-up commands $follow_up = i18n::s('Where do you want to go now?'); diff --git a/feeds/index.php b/feeds/index.php index 1f3ef1aaf..aa1b2c88d 100644 --- a/feeds/index.php +++ b/feeds/index.php @@ -104,7 +104,7 @@ $outbound .= '

'.i18n::s('More specific outbound feeds are also available. Look for the XML button at other places:').'

'."\n