From da51a2876625d33df66ae4037988dd6f1da8eb0a Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 23 Nov 2015 17:22:29 +0100 Subject: [PATCH 001/356] Fix : situation percent should be 100 by default --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 6f8484cbc42..099dc9f4185 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3897,7 +3897,7 @@ class FactureLigne extends CommonInvoiceLine if (empty($this->special_code)) $this->special_code=0; if (empty($this->fk_parent_line)) $this->fk_parent_line=0; if (empty($this->fk_prev_id)) $this->fk_prev_id = 'null'; - if (empty($this->situation_percent)) $this->situation_percent = 0; + if (empty($this->situation_percent)) $this->situation_percent = 100; if (empty($this->pa_ht)) $this->pa_ht=0; From 2c95344f05784cac7b55385e402ae7a482522231 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 11:09:05 +0100 Subject: [PATCH 002/356] Add date start and end of intervention --- htdocs/install/mysql/tables/llx_fichinter.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 58f953c7196..544e5da7c21 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -34,6 +34,8 @@ create table llx_fichinter fk_user_modif integer, -- user making last change fk_user_valid integer, -- valideur de la fiche fk_statut smallint DEFAULT 0, + dateo date, -- date de début d'intervention + datee date, -- date de fin d'intervention duree real, -- duree totale de l'intervention description text, note_private text, From bf9cb46aad9368c3c390afe939940d2440abd1ff Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 11:16:49 +0100 Subject: [PATCH 003/356] update dateo and datee based on fichinterdet we update fields datee and dateo based on fichinterdet like this we can show on fichinter the start and the end of the intervention --- htdocs/fichinter/class/fichinter.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index c1e7a3aaca2..336e023c0ac 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1264,7 +1264,7 @@ class FichinterLigne extends CommonObjectLine $this->db->begin(); - $sql = "SELECT SUM(duree) as total_duration"; + $sql = "SELECT SUM(duree) as total_duration, min(date) as dateo, max(date) as datee "; $sql.= " FROM ".MAIN_DB_PREFIX."fichinterdet"; $sql.= " WHERE fk_fichinter=".$this->fk_fichinter; @@ -1278,6 +1278,8 @@ class FichinterLigne extends CommonObjectLine $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter"; $sql.= " SET duree = ".$total_duration; + $sql.= " , dateo = ".(! empty($obj->dateo)?"'".$this->db->idate($obj->dateo)."'":"null"); + $sql.= " , datee = ".(! empty($obj->datee)?"'".$this->db->idate($obj->datee)."'":"null"); $sql.= " WHERE rowid = ".$this->fk_fichinter; $sql.= " AND entity = ".$conf->entity; From f3ff8c5951f4d0ef4a91d0fc2c315354e28e286f Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 11:25:07 +0100 Subject: [PATCH 004/356] add dates of intervention --- htdocs/fichinter/card.php | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 403f1411dc8..81b33594317 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -5,7 +5,7 @@ * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Ferran Marcet - * Copyright (C) 201 Charlie Benke + * Copyright (C) 2014-2015 Charlie Benke * Copyright (C) 2015 Abbes Bahfir * * This program is free software; you can redistribute it and/or modify @@ -1275,6 +1275,42 @@ else if ($id > 0 || ! empty($ref)) print ''.$langs->trans("TotalDuration").''; print ''.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).''; print ''; + + // Date create + print ''.$langs->trans("Datec").''; + print ''; + print $object->datec ? dol_print_date($object->datec, 'daytext') : ' '; + print ''; + print ''; + + // Date Validation + print ''.$langs->trans("Datev").''; + print ''; + print $object->datev ? dol_print_date($object->datev, 'daytext') : ' '; + print ''; + print ''; + + // Date End + print ''.$langs->trans("Datee").''; + print ''; + print $object->datee ? dol_print_date($object->datee, 'daytext') : ' '; + print ''; + print ''; + + // Date Start + print ''.$langs->trans("Dateo").''; + print ''; + print $object->dateo ? dol_print_date($object->dateo, 'daytext') : ' '; + print ''; + print ''; + + // Date End + print ''.$langs->trans("Datee").''; + print ''; + print $object->datee ? dol_print_date($object->datee, 'daytext') : ' '; + print ''; + print ''; + } // Description (must be a textarea and not html must be allowed (used in list view) From 7ea3df4d063108c6ac543206951ed017d4483f0a Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 11:28:28 +0100 Subject: [PATCH 005/356] add date start and end of intervention add dateo (date open/start) and datee (date end) of intervention this date are filled by the fichinterdet date and can be displayed on planning --- htdocs/fichinter/class/fichinter.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 336e023c0ac..4201d952501 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2015 Marcos García + * Copyright (C) 2015 Charlie Benke * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,6 +49,8 @@ class Fichinter extends CommonObject var $author; var $datec; var $datev; + var $dateo; + var $datee; var $datem; var $duration; var $statut; // 0=draft, 1=validated, 2=invoiced @@ -277,7 +280,7 @@ class Fichinter extends CommonObject function fetch($rowid,$ref='') { $sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,"; - $sql.= " f.datec,"; + $sql.= " f.datec, f.dateo, f.datee,"; $sql.= " f.date_valid as datev,"; $sql.= " f.tms as datem,"; $sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat"; @@ -300,6 +303,8 @@ class Fichinter extends CommonObject $this->statut = $obj->fk_statut; $this->duration = $obj->duree; $this->datec = $this->db->jdate($obj->datec); + $this->datee = $this->db->jdate($obj->dateo); + $this->dateo = $this->db->jdate($obj->datee); $this->datev = $this->db->jdate($obj->datev); $this->datem = $this->db->jdate($obj->datem); $this->fk_project = $obj->fk_projet; From 46aaf9c270c150c3012ad4f1f784984b9cc97974 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 12:34:17 +0100 Subject: [PATCH 006/356] Update 3.8.0-3.9.0.sql --- htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index e83eff0ce4d..d0105c9273c 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -22,6 +22,10 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); +-- Was done into a 3.8 fix, so we must do it also in 3.9 +ALTER TABLE llx_fichinter ADD COLUMN datee date after duration; +ALTER TABLE llx_fichinter ADD COLUMN dateo date after duration; + -- Was done into a 3.8 fix, so we must do it also in 3.9 ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country; From 1da6b066059bfe040b4858096cf431b28bfd3113 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 4 Dec 2015 13:23:13 +0100 Subject: [PATCH 007/356] Update 3.8.0-3.9.0.sql --- htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index d0105c9273c..5eac3db5386 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -23,8 +23,8 @@ -- Was done into a 3.8 fix, so we must do it also in 3.9 -ALTER TABLE llx_fichinter ADD COLUMN datee date after duration; -ALTER TABLE llx_fichinter ADD COLUMN dateo date after duration; +ALTER TABLE llx_fichinter ADD COLUMN datee date after duree; +ALTER TABLE llx_fichinter ADD COLUMN dateo date after duree; -- Was done into a 3.8 fix, so we must do it also in 3.9 ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country; From 02f4c9879bab0399890de1b8b3134a30131419e4 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Sat, 5 Dec 2015 10:16:56 +0100 Subject: [PATCH 008/356] Update card.php --- htdocs/fichinter/card.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 81b33594317..b25c8b38b0d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1289,13 +1289,6 @@ else if ($id > 0 || ! empty($ref)) print $object->datev ? dol_print_date($object->datev, 'daytext') : ' '; print ''; print ''; - - // Date End - print ''.$langs->trans("Datee").''; - print ''; - print $object->datee ? dol_print_date($object->datee, 'daytext') : ' '; - print ''; - print ''; // Date Start print ''.$langs->trans("Dateo").''; From 2f5f6c9ead63d082d88a3f46cc978faf8fdbca5e Mon Sep 17 00:00:00 2001 From: phf Date: Thu, 10 Dec 2015 13:48:37 +0100 Subject: [PATCH 009/356] NEW hidden conf to use input file multiple from mail form --- htdocs/core/class/html.formmail.class.php | 3 +- htdocs/core/lib/files.lib.php | 107 ++++++++++++---------- 2 files changed, 63 insertions(+), 47 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index c9e8ab7899d..b3016be1836 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -615,7 +615,8 @@ class FormMail extends Form } if ($this->withfile == 2) // Can add other files { - $out.= ''; + if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out.= ''; + else $out.= ''; $out.= ' '; $out.= ''; } diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index db6582ba332..c8891e5c325 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1438,56 +1438,71 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG); if (dol_mkdir($upload_dir) >= 0) { - // Define $destpath (path to file including filename) and $destfile (only filename) - $destpath=$upload_dir . "/" . $_FILES[$varfiles]['name']; - $destfile=$_FILES[$varfiles]['name']; - - $savingdocmask = dol_sanitizeFileName($savingdocmask); - - if ($savingdocmask) + $TFile = $_FILES[$varfiles]; + if (!is_array($TFile['name'])) { - $destpath=$upload_dir . "/" . preg_replace('/__file__/',$_FILES[$varfiles]['name'],$savingdocmask); - $destfile=preg_replace('/__file__/',$_FILES[$varfiles]['name'],$savingdocmask); - } - - $resupload = dol_move_uploaded_file($_FILES[$varfiles]['tmp_name'], $destpath, $allowoverwrite, 0, $_FILES[$varfiles]['error'], 0, $varfiles); - if (is_numeric($resupload) && $resupload > 0) - { - include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; - if (empty($donotupdatesession)) + foreach ($TFile as $key => &$val) { - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; - $formmail = new FormMail($db); - $formmail->add_attached_files($destpath, $destfile, $_FILES[$varfiles]['type']); - } - if (image_format_supported($destpath) == 1) - { - // Create small thumbs for image (Ratio is near 16/9) - // Used on logon for example - $imgThumbSmall = vignette($destpath, 160, 120, '_small', 50, "thumbs"); - // Create mini thumbs for image (Ratio is near 16/9) - // Used on menu or for setup page for example - $imgThumbMini = vignette($destpath, 160, 120, '_mini', 50, "thumbs"); - } - - setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs'); - } - else - { - $langs->load("errors"); - if ($resupload < 0) // Unknown error - { - setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors'); - } - else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus - { - setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors'); - } - else // Known error - { - setEventMessages($langs->trans($resupload), null, 'errors'); + $val = array($val); } } + + $nbfile = count($TFile['name']); + + for ($i = 0; $i < $nbfile; $i++) + { + // Define $destpath (path to file including filename) and $destfile (only filename) + $destpath=$upload_dir . "/" . $TFile['name'][$i]; + $destfile=$TFile['name'][$i]; + + $savingdocmask = dol_sanitizeFileName($savingdocmask); + + if ($savingdocmask) + { + $destpath=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask); + $destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask); + } + + $resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destpath, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles); + if (is_numeric($resupload) && $resupload > 0) + { + include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; + if (empty($donotupdatesession)) + { + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + $formmail->add_attached_files($destpath, $destfile, $TFile['type'][$i]); + } + if (image_format_supported($destpath) == 1) + { + // Create small thumbs for image (Ratio is near 16/9) + // Used on logon for example + $imgThumbSmall = vignette($destpath, 160, 120, '_small', 50, "thumbs"); + // Create mini thumbs for image (Ratio is near 16/9) + // Used on menu or for setup page for example + $imgThumbMini = vignette($destpath, 160, 120, '_mini', 50, "thumbs"); + } + + setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs'); + } + else + { + $langs->load("errors"); + if ($resupload < 0) // Unknown error + { + setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors'); + } + else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus + { + setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors'); + } + else // Known error + { + setEventMessages($langs->trans($resupload), null, 'errors'); + } + } + } + } } elseif ($link) { if (dol_mkdir($upload_dir) >= 0) { From c3acee56e259960d513e6a6bed9197ef5a4082cb Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 12 Dec 2015 10:06:11 +0100 Subject: [PATCH 010/356] Fix #3879 Wrong translation in the new expense report module --- htdocs/langs/en_US/trips.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index c6f4f316a04..4697132bddf 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -33,7 +33,7 @@ ConfirmDeleteLine=Are you sure you want to delete this line ? PDFStandardExpenseReports=Standard template to generate a PDF document for expense report ExpenseReportLine=Expense report line TF_OTHER=Other -TF_TRANSPORTATION=Transportation +TF_TRIP=Transportation TF_LUNCH=Lunch TF_METRO=Metro TF_TRAIN=Train From 1978eebb69d3c5cbbb5ab6b56cb6dfe837ef5e5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 13 Dec 2015 17:33:20 +0100 Subject: [PATCH 011/356] Fix bad merge --- htdocs/product/class/product.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 94bc2f6c63b..5b969023cb5 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -811,7 +811,6 @@ class Product extends CommonObject // Delete all child tables if (! $error) - foreach($elements as $table) { $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price'); foreach($elements as $table) From 84ee18a11b2f0c9d202d6c527e620bf1f5a03690 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 14 Dec 2015 10:33:18 +0100 Subject: [PATCH 012/356] Fix bad management of second level approvement --- .../class/fournisseur.commande.class.php | 12 +++++++--- htdocs/fourn/commande/card.php | 22 +++++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index c791a4a9b83..7685c715494 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -695,7 +695,8 @@ class CommandeFournisseur extends CommonOrder // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated) $movetoapprovestatus=true; - + $comment=''; + $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " SET ref='".$this->db->escape($num)."',"; if (empty($secondlevel)) // standard or first level approval @@ -704,7 +705,11 @@ class CommandeFournisseur extends CommonOrder $sql.= " fk_user_approve = ".$user->id; if (! empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) { - if (empty($this->user_approve_id2)) $movetoapprovestatus=false; // second level approval not done + if (empty($this->user_approve_id2)) + { + $movetoapprovestatus=false; // second level approval not done + $comment=' (first level)'; + } } } else // request a second level approval @@ -712,6 +717,7 @@ class CommandeFournisseur extends CommonOrder $sql.= " date_approve2='".$this->db->idate($now)."',"; $sql.= " fk_user_approve2 = ".$user->id; if (empty($this->user_approve_id)) $movetoapprovestatus=false; // first level approval not done + $comment=' (second level)'; } // If double approval is required and first approval, we keep status to 1 = validated if ($movetoapprovestatus) $sql.= ", fk_statut = 2"; @@ -721,7 +727,7 @@ class CommandeFournisseur extends CommonOrder if ($this->db->query($sql)) { - $this->log($user, 2, time()); // Statut 2 + $this->log($user, 2, time(), $comment); // Statut 2 if (! empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT)) { diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 50bcefc36b2..d0d32cf237c 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2696,10 +2696,24 @@ elseif (! empty($object->id)) // Reopen if (in_array($object->statut, array(2))) { - if ($user->rights->fournisseur->commande->commander) - { - print ''.$langs->trans("Disapprove").''; - } + $buttonshown=0; + if (! $buttonshown && $user->rights->fournisseur->commande->approuver) + { + if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) + || (! empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) + { + print ''.$langs->trans("Disapprove").''; + $buttonshown++; + } + } + if (! $buttonshown && $user->rights->fournisseur->commande->approve2 && ! empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL)) + { + if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) + || (! empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) + { + print ''.$langs->trans("Disapprove").''; + } + } } if (in_array($object->statut, array(3, 5, 6, 7, 9))) { From 3e3dbf850f1d9d6575057c24298d31d03f46638c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 15 Dec 2015 09:44:17 +0100 Subject: [PATCH 013/356] Fix: bad case for function --- htdocs/core/class/translate.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 5d06586fb16..06be06330b6 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -158,7 +158,7 @@ class Translate * @param int $forcelangdir To force a different lang directory * @return int <0 if KO, 0 if already loaded or loading not required, >0 if OK */ - function Load($domain,$alt=0,$stopafterdirection=0,$forcelangdir='') + function load($domain,$alt=0,$stopafterdirection=0,$forcelangdir='') { global $conf; From 23e727048ef4aea9362e1742f63aa1102c09ca30 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Tue, 15 Dec 2015 10:35:11 +0100 Subject: [PATCH 014/356] Add some new translations for export feature --- htdocs/langs/en_US/accountancy.lang | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index df0eee60eb6..90e298b031e 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -165,4 +165,18 @@ ValidateHistory=Validate Automatically ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used FicheVentilation=Breakdown card -GeneralLedgerIsWritten=Operations are written in the general ledger \ No newline at end of file +GeneralLedgerIsWritten=Operations are written in the general ledger + +##Export Journal Feature +ExportFormat=Format of Export +Prefixname=Prefix of export File +Separate=Export separator +Textframe=Frame of text value +Headercol=Colname in header of file +Fieldname=Name of Field +Headername=Name in header +Type=Type of fields +Param=Additionnal parameters +EnabledProduct=In Product +EnabledTiers=In Tiers +EnabledVat=In Vat From 3e8c670e84fc7fd1eba33269363d814c446b4fbe Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Tue, 15 Dec 2015 11:46:20 +0100 Subject: [PATCH 015/356] Update 3.8.0-3.9.0.sql --- htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index 5eac3db5386..0323b77c782 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -23,6 +23,7 @@ -- Was done into a 3.8 fix, so we must do it also in 3.9 +ALTER TABLE llx_fichinter ADD COLUMN datet date after duree; ALTER TABLE llx_fichinter ADD COLUMN datee date after duree; ALTER TABLE llx_fichinter ADD COLUMN dateo date after duree; From 85344aa955d8fca4dece409e9acc6297fb1b1d61 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Tue, 15 Dec 2015 11:46:56 +0100 Subject: [PATCH 016/356] Update llx_fichinter.sql --- htdocs/install/mysql/tables/llx_fichinter.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql index 544e5da7c21..b3e2001f9c3 100644 --- a/htdocs/install/mysql/tables/llx_fichinter.sql +++ b/htdocs/install/mysql/tables/llx_fichinter.sql @@ -36,6 +36,7 @@ create table llx_fichinter fk_statut smallint DEFAULT 0, dateo date, -- date de début d'intervention datee date, -- date de fin d'intervention + datet date, -- date de terminaison de l'intervention duree real, -- duree totale de l'intervention description text, note_private text, From ad7c90fc19076c3190d6103520d94b9958e0dbf4 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Tue, 15 Dec 2015 11:52:11 +0100 Subject: [PATCH 017/356] Update fichinter.class.php --- htdocs/fichinter/class/fichinter.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 4201d952501..ca698c55d5c 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -51,9 +51,10 @@ class Fichinter extends CommonObject var $datev; var $dateo; var $datee; + var $datet; var $datem; var $duration; - var $statut; // 0=draft, 1=validated, 2=invoiced + var $statut; // 0=draft, 1=validated, 2=invoiced, 3=Terminate var $description; var $fk_contrat; var $extraparams=array(); @@ -77,12 +78,15 @@ class Fichinter extends CommonObject $this->statuts[0]='Draft'; $this->statuts[1]='Validated'; $this->statuts[2]='StatusInterInvoiced'; + $this->statuts[3]='Close'; $this->statuts_short[0]='Draft'; $this->statuts_short[1]='Validated'; $this->statuts_short[2]='StatusInterInvoiced'; + $this->statuts_short[3]='Close'; $this->statuts_logo[0]='statut0'; - $this->statuts_logo[1]='statut4'; + $this->statuts_logo[1]='statut1'; $this->statuts_logo[2]='statut6'; + $this->statuts_logo[3]='statut4'; } @@ -280,7 +284,7 @@ class Fichinter extends CommonObject function fetch($rowid,$ref='') { $sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,"; - $sql.= " f.datec, f.dateo, f.datee,"; + $sql.= " f.datec, f.dateo, f.datee, f.datet,"; $sql.= " f.date_valid as datev,"; $sql.= " f.tms as datem,"; $sql.= " f.duree, f.fk_projet, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat"; @@ -305,6 +309,7 @@ class Fichinter extends CommonObject $this->datec = $this->db->jdate($obj->datec); $this->datee = $this->db->jdate($obj->dateo); $this->dateo = $this->db->jdate($obj->datee); + $this->datet = $this->db->jdate($obj->datet); $this->datev = $this->db->jdate($obj->datev); $this->datem = $this->db->jdate($obj->datem); $this->fk_project = $obj->fk_projet; From 2405276a362c67585d0ce693ea40e533efeb84b0 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Tue, 15 Dec 2015 11:54:00 +0100 Subject: [PATCH 018/356] Update card.php --- htdocs/fichinter/card.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index b25c8b38b0d..dbfcc96ebe4 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1304,6 +1304,12 @@ else if ($id > 0 || ! empty($ref)) print ''; print ''; + // Date Terminate/close + print ''.$langs->trans("Datet").''; + print ''; + print $object->datet ? dol_print_date($object->datet, 'daytext') : ' '; + print ''; + print ''; } // Description (must be a textarea and not html must be allowed (used in list view) From dfbc2814e78d9c91f122b172096546ec63975d47 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 15 Dec 2015 21:10:53 +0100 Subject: [PATCH 019/356] Fix: Add an empty field for list of parent account - This value can be null --- htdocs/accountancy/admin/card.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index ad6ca01b6ca..0608fcdb73e 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -145,13 +145,13 @@ if ($action == 'create') print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; print ''; print ''; + print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); + print ''; + } $indiceAsked++; } @@ -939,6 +1010,8 @@ else if ($id || $ref) $soc = new Societe($db); $soc->fetch($object->socid); + + $res = $object->fetch_optionals($object->id, $extralabels); $head=shipping_prepare_head($object); dol_fiche_head($head, 'shipping', $langs->trans("Shipment"), 0, 'sending'); @@ -1259,9 +1332,9 @@ else if ($id || $ref) } // Other attributes - $parameters=array('colspan' => ' colspan="3"'); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - + $cols = 3; + include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; + print "
' . $langs->trans("AccountNumber") . '
' . $langs->trans("AccountNumber") . '
' . $langs->trans("Label") . '
' . $langs->trans("Label") . '
' . $langs->trans("Accountparent") . ''; - print $htmlacc->select_account($accounting->account_parent, 'account_parent'); + print $htmlacc->select_account($accounting->account_parent, 'account_parent', 1); print '
' . $langs->trans("Pcgtype") . ''; @@ -195,13 +195,13 @@ else if ($id) print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; print ''; print '\n"; + + // Other attributes + $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action); // Note that $action and $object may have been modified by hook + + if (empty($reshook) && ! empty($extrafields->attribute_label)) { + print $expe->showOptionals($extrafields, 'edit'); + } + // Incoterms if (!empty($conf->incoterm->enabled)) @@ -624,17 +688,13 @@ if ($action == 'create') $liste = ModelePdfExpedition::liste_modeles($db); print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF); print "\n"; - - // Other attributes - $parameters=array('colspan' => ' colspan="3"'); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action); // Note that $action and $object may have been modified by hook - + print "
' . $langs->trans("AccountNumber") . '
' . $langs->trans("AccountNumber") . '
' . $langs->trans("Label") . '
' . $langs->trans("Label") . '
' . $langs->trans("Accountparent") . ''; - print $htmlacc->select_account($accounting->account_parent, 'account_parent'); + print $htmlacc->select_account($accounting->account_parent, 'account_parent', 1); print '
' . $langs->trans("Pcgtype") . ''; From cb7f29b332e95df302a68ffc765643f56af30610 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 16 Dec 2015 13:32:44 +0100 Subject: [PATCH 020/356] Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context --- htdocs/includes/adodbtime/adodb-time.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php index 1be5f4cd607..88d05d2f2b1 100644 --- a/htdocs/includes/adodbtime/adodb-time.inc.php +++ b/htdocs/includes/adodbtime/adodb-time.inc.php @@ -1006,7 +1006,7 @@ function adodb_tz_offset($gmt,$isphp5) return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); else return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); - break; + //break; } From ef487c48a4231950de10564d1ae33df36eed91f6 Mon Sep 17 00:00:00 2001 From: cla Date: Wed, 16 Dec 2015 16:18:29 +0100 Subject: [PATCH 021/356] NEW Extrafields for: - expedition, expeditiondet, livraison, livraisondet --- htdocs/admin/confexped.php | 28 +--- htdocs/admin/expedition.php | 26 +--- htdocs/admin/expedition_extrafields.php | 126 ++++++++++++++++ htdocs/admin/expeditiondet_extrafields.php | 126 ++++++++++++++++ htdocs/admin/livraison.php | 26 +--- htdocs/admin/livraison_extrafields.php | 126 ++++++++++++++++ htdocs/admin/livraisondet_extrafields.php | 126 ++++++++++++++++ htdocs/core/lib/expedition.lib.php | 142 ++++++++++++++++++ htdocs/core/tpl/extrafields_view.tpl.php | 2 + htdocs/expedition/card.php | 117 ++++++++++++--- htdocs/expedition/class/expedition.class.php | 84 +++++++++-- .../install/mysql/migration/3.8.0-3.9.0.sql | 48 ++++++ .../tables/llx_expedition_extrafields.key.sql | 20 +++ .../tables/llx_expedition_extrafields.sql | 26 ++++ .../llx_expeditiondet_extrafields.key.sql | 20 +++ .../tables/llx_expeditiondet_extrafields.sql | 25 +++ .../tables/llx_livraison_extrafields.key.sql | 20 +++ .../tables/llx_livraison_extrafields.sql | 26 ++++ .../llx_livraisondet_extrafields.key.sql | 20 +++ .../tables/llx_livraisondet_extrafields.sql | 25 +++ htdocs/livraison/card.php | 108 ++++++++++++- htdocs/livraison/class/livraison.class.php | 47 +++++- 22 files changed, 1209 insertions(+), 105 deletions(-) create mode 100644 htdocs/admin/expedition_extrafields.php create mode 100644 htdocs/admin/expeditiondet_extrafields.php create mode 100644 htdocs/admin/livraison_extrafields.php create mode 100644 htdocs/admin/livraisondet_extrafields.php create mode 100644 htdocs/core/lib/expedition.lib.php create mode 100644 htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql create mode 100644 htdocs/install/mysql/tables/llx_expedition_extrafields.sql create mode 100644 htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql create mode 100644 htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql create mode 100644 htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql create mode 100644 htdocs/install/mysql/tables/llx_livraison_extrafields.sql create mode 100644 htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql create mode 100644 htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index f8d13421b24..059915df3d8 100644 --- a/htdocs/admin/confexped.php +++ b/htdocs/admin/confexped.php @@ -2,7 +2,8 @@ /* Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2011-2015 Juanjo Menent + * Copyright (C) 2011-2015 Juanjo Menent ù + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; $langs->load("admin"); $langs->load("sendings"); @@ -76,29 +78,9 @@ llxHeader("",""); $linkback=''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; +$head = expedition_admin_prepare_head(); -$h = 0; - -$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; -$head[$h][1] = $langs->trans("Setup"); -$hselected=$h; -$h++; - -if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) -{ - $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; - $head[$h][1] = $langs->trans("Shipment"); - $h++; -} - -if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) -{ - $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; - $head[$h][1] = $langs->trans("Receivings"); - $h++; -} - -dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); +dol_fiche_head($head, 'general', $langs->trans("ModuleSetup"), 0, 'sending'); /* * Formulaire parametres divers diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 555badf11d8..42741b49c7a 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -30,6 +30,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("admin"); @@ -219,30 +220,9 @@ llxHeader("",""); $linkback=''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; +$head = expedition_admin_prepare_head(); - -//if ($mesg) print $mesg.'
'; - - -$h = 0; - -$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; -$head[$h][1] = $langs->trans("Setup"); -$h++; - -$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; -$head[$h][1] = $langs->trans("Shipment"); -$hselected=$h; -$h++; - -if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) -{ - $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; - $head[$h][1] = $langs->trans("Receivings"); - $h++; -} - -dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); +dol_fiche_head($head, 'shipment', $langs->trans("Sendings"), 0, 'sending'); /* * Expedition numbering model diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php new file mode 100644 index 00000000000..7db9a8f2526 --- /dev/null +++ b/htdocs/admin/expedition_extrafields.php @@ -0,0 +1,126 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2015 Claudio Aschieri + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/expedition_extrafields.php + * \ingroup expedition + * \brief Page to setup extra fields of expedition + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + + +if (!$user->admin) + accessforbidden(); + +$langs->load("admin"); +$langs->load("other"); +$langs->load("sendings"); +$langs->load("deliveries"); + + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=ExtraFields::$type2label; +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='expedition'; //Must be the $table_element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; + + + +/* + * View + */ + +$textobject=$langs->transnoentitiesnoconv("Sendings"); + +llxHeader('',$langs->trans("SendingsSetup")); + +$linkback=''.$langs->trans("BackToModuleList").''; +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print "
\n"; + +$head = expedition_admin_prepare_head(); + +dol_fiche_head($head, 'attributes_shipment', $langs->trans("Sendings"), 0, 'sending'); + +require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel */ +/* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print load_fiche_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php new file mode 100644 index 00000000000..caddf621db5 --- /dev/null +++ b/htdocs/admin/expeditiondet_extrafields.php @@ -0,0 +1,126 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Claudio Aschieri + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/expeditiondet_extrafields.php + * \ingroup expedition + * \brief Page to setup extra fields of expedition + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + + +if (!$user->admin) + accessforbidden(); + +$langs->load("admin"); +$langs->load("other"); +$langs->load("sendings"); + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=ExtraFields::$type2label; +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='expeditiondet'; //Must be the $table_element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; + + + +/* + * View + */ + +$textobject=$langs->transnoentitiesnoconv("Sendings"); + +llxHeader('',$langs->trans("SendingsSetup")); + +$linkback=''.$langs->trans("BackToModuleList").''; +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print "
\n"; + +$head = expedition_admin_prepare_head(); + +dol_fiche_head($head, 'attributeslines_shipment', $langs->trans("Sendings"), 0, 'sending'); + +require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel */ +/* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print load_fiche_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index ec00cc7233c..e7112d1fbfe 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -7,6 +7,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2011-2015 Philippe Grand + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,7 @@ */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; $langs->load("admin"); @@ -210,28 +212,10 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); print '
'; +$head = expedition_admin_prepare_head(); +dol_fiche_head($head, 'receivings', $langs->trans("Receivings"), 0, 'sending'); -$h = 0; - -$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; -$head[$h][1] = $langs->trans("Setup"); -$h++; - -if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) -{ - $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; - $head[$h][1] = $langs->trans("Shipment"); - $h++; -} - -$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; -$head[$h][1] = $langs->trans("Receivings"); -$hselected=$h; -$h++; - - -dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); /* * Livraison numbering model @@ -503,7 +487,7 @@ print ''; print ''; print '
'; print $langs->trans("FreeLegalTextOnDeliveryReceipts").' ('.$langs->trans("AddCRIfTooLong").')
'; -print ''; +$variablename='DELIVERY_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { print ''; diff --git a/htdocs/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php new file mode 100644 index 00000000000..a236e4954cf --- /dev/null +++ b/htdocs/admin/livraison_extrafields.php @@ -0,0 +1,126 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2015 Claudio Aschieri + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/livraison_extrafields.php + * \ingroup livraison + * \brief Page to setup extra fields of livraison + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + + +if (!$user->admin) + accessforbidden(); + +$langs->load("admin"); +$langs->load("other"); +$langs->load("sendings"); +$langs->load("deliveries"); + + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=ExtraFields::$type2label; +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='livraison'; //Must be the $table_element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; + + + +/* + * View + */ + +$textobject=$langs->transnoentitiesnoconv("Receivings"); + +llxHeader('',$langs->trans("SendingsSetup")); + +$linkback=''.$langs->trans("BackToModuleList").''; +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print "
\n"; + +$head = expedition_admin_prepare_head(); + +dol_fiche_head($head, 'attributes_receivings', $langs->trans("Receivings"), 0, 'sending'); + +require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel */ +/* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print load_fiche_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/admin/livraisondet_extrafields.php b/htdocs/admin/livraisondet_extrafields.php new file mode 100644 index 00000000000..ffa00ecf2be --- /dev/null +++ b/htdocs/admin/livraisondet_extrafields.php @@ -0,0 +1,126 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2012 Florian Henry + * Copyright (C) 2013 Philippe Grand + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Claudio Aschieri + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/livraisondet_extrafields.php + * \ingroup livraison + * \brief Page to setup extra fields of livraison + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + + +if (!$user->admin) + accessforbidden(); + +$langs->load("admin"); +$langs->load("other"); +$langs->load("sendings"); + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=ExtraFields::$type2label; +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='livraisondet'; //Must be the $table_element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php'; + + + +/* + * View + */ + +$textobject=$langs->transnoentitiesnoconv("Receivings"); + +llxHeader('',$langs->trans("SendingsSetup")); + +$linkback=''.$langs->trans("BackToModuleList").''; +print load_fiche_titre($langs->trans("SendingsSetup"),$linkback,'title_setup'); +print "
\n"; + +$head = expedition_admin_prepare_head(); + +dol_fiche_head($head, 'attributeslines_receivings', $langs->trans("Receivings"), 0, 'sending'); + +require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel */ +/* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print load_fiche_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print load_fiche_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php new file mode 100644 index 00000000000..0fa5f0ae643 --- /dev/null +++ b/htdocs/core/lib/expedition.lib.php @@ -0,0 +1,142 @@ + + * Copyright (C) 2007 Rodolphe Quiedeville + * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2010 Juanjo Menent + * Copyright (C) 2015 Claudio Aschieri + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/lib/expedition.lib.php + * \brief Function for expedition module + * \ingroup expedition + */ + +/** + * Prepare array with list of tabs + * + * @param Expedition $object Object related to tabs + * @return array Array of tabs to show + */ +function expedition_prepare_head(Expedition $object) +{ + global $langs, $conf, $user; + if (! empty($conf->expedition->enabled)) $langs->load("sendings"); + $langs->load("orders"); + + $h = 0; + $head = array(); + $h = 0; + + $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; + $head[$h][1] = $langs->trans("Setup"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; + $head[$h][1] = $langs->trans("Shipment"); + $hselected=$h; + $h++; + + if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) + { + $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; + $head[$h][1] = $langs->trans("Receivings"); + $h++; + } + + + complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove'); + + return $head; +} + +/** + * Return array head with list of tabs to view object informations. + * + * @return array head array with tabs + */ +function expedition_admin_prepare_head() +{ + global $langs, $conf, $user; + $langs->load("sendings"); + + $h = 0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php"; + $head[$h][1] = $langs->trans("Setup"); + $head[$h][2] = 'general'; + $h++; + + + if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) + { + $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php"; + $head[$h][1] = $langs->trans("Shipment"); + $head[$h][2] = 'shipment'; + $h++; + } + + + if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) + { + $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes_shipment'; + $h++; + } + + if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) + { + $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsLines"); + $head[$h][2] = 'attributeslines_shipment'; + $h++; + } + + if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) + { + $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php"; + $head[$h][1] = $langs->trans("Receivings"); + $head[$h][2] = 'receivings'; + $h++; + } + + if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) + { + $head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes_receivings'; + $h++; + } + + if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON)) + { + $head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFieldsLines"); + $head[$h][2] = 'attributeslines_receivings'; + $h++; + } + + + + complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove'); + + return $head; +} + + diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index b29016ac28b..8b38cbc5520 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -59,6 +59,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) if (isset($user->rights->$keyforperm)) $permok=$user->rights->$keyforperm->creer||$user->rights->$keyforperm->create||$user->rights->$keyforperm->write; if ($object->element=='order_supplier') $permok=$user->rights->fournisseur->commande->creer; if ($object->element=='invoice_supplier') $permok=$user->rights->fournisseur->facture->creer; + if ($object->element=='shipping') $permok=$user->rights->expedition->creer; + if ($object->element=='delivery') $permok=$user->rights->expedition->livraison->creer; if (($object->statut == 0 || $extrafields->attribute_alwayseditable[$key]) && $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key)) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 6a236ab534e..b3db0a40e12 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -8,6 +8,7 @@ * Copyright (C) 2013 Marcos García * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2014 Francis Appels + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; @@ -75,6 +77,15 @@ $hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty( $hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); $object = new Expedition($db); +$extrafields = new ExtraFields($db); +$extrafieldsline = new ExtraFields($db); + +// fetch optionals attributes and labels +$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); + +// fetch optionals attributes lines and labels +$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line); + // Load object. Make an object->fetch include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once @@ -111,6 +122,33 @@ if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); } +if ($action == 'update_extras') +{ + // Fill array 'array_options' with data from update form + $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); + $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute')); + if ($ret < 0) $error++; + + if (! $error) + { + // Actions on extra fields (by external module or standard code) + // TODO le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('expeditiondao')); + $parameters = array('id' => $object->id); + $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) { + $result = $object->insertExtraFields(); + if ($result < 0) { + $error++; + } + } else if ($reshook < 0) + $error++; + } + + if ($error) + $action = 'edit_extras'; +} + $parameters=array(); $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -119,9 +157,10 @@ if (empty($reshook)) { include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once - if ($action == 'add') + if ($action == 'add' && $user->rights->expedition->creer) { $error=0; + $predef=''; $db->begin(); @@ -157,7 +196,8 @@ if (empty($reshook)) $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); $batch_line = array(); - + $array_options=array(); + $num=count($objectsrc->lines); $totalqty=0; @@ -201,8 +241,20 @@ if (empty($reshook)) //shipment line for product with no batch management if (GETPOST($qty,'int') > 0) $totalqty+=GETPOST($qty,'int'); } + + // Extrafields + $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line); + $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i); + // Unset extrafield + if (is_array($extralabelsline)) { + // Get extra fields + foreach ($extralabelsline as $key => $value) { + unset($_POST["options_" . $key]); + } + } + } - + //var_dump($batch_line[2]); if ($totalqty > 0) // There is at least one thing to ship @@ -220,8 +272,8 @@ if (empty($reshook)) $idl = "idl".$i; $entrepot_id = is_numeric(GETPOST($ent,'int'))?GETPOST($ent,'int'):GETPOST('entrepot_id','int'); if ($entrepot_id < 0) $entrepot_id=''; - - $ret=$object->addline($entrepot_id,GETPOST($idl,'int'),GETPOST($qty,'int')); + + $ret=$object->addline($entrepot_id,GETPOST($idl,'int'),GETPOST($qty,'int'),$array_options[$i]); if ($ret < 0) { $mesg='
'.$object->error.'
'; @@ -234,7 +286,7 @@ if (empty($reshook)) // batch mode if ($batch_line[$i]['qty']>0) { - $ret=$object->addline_batch($batch_line[$i]); + $ret=$object->addline_batch($batch_line[$i],$array_options[$i]); if ($ret < 0) { $mesg='
'.$object->error.'
'; @@ -242,8 +294,11 @@ if (empty($reshook)) } } } - } - + } + // Fill array 'array_options' with data from add form + $ret = $extrafields->setOptionalsFromPost($extralabels, $object); + if ($ret < 0) $error++; + if (! $error) { $ret=$object->create($user); // This create shipment (like Odoo picking) and line of shipments. Stock movement will when validating shipment. @@ -606,6 +661,15 @@ if ($action == 'create') print '		'; print ''; print "
"; dol_fiche_end(); /* - * Lignes de commandes + * Expedition Lines */ $numAsked = count($object->lines); @@ -898,6 +958,17 @@ if ($action == 'create') print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->libelle); } } + + + //Display lines extrafields + if (is_array($extralabelslines) && count($extralabelslines)>0) { + $colspan=5; + $line = new ExpeditionLigne($db); + $line->fetch_optionals($object->id,$extralabelslines); + print '
\n"; /* @@ -1444,6 +1517,16 @@ else if ($id || $ref) } } print ""; + + //Display lines extrafields + if (is_array($extralabelslines) && count($extralabelslines)>0) { + $colspan= empty($conf->productbatch->enabled) ? 5 : 6; + $line = new ExpeditionLigne($db); + $line->fetch_optionals($lines[$i]->id,$extralabelslines); + print ''; + print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); + print ''; + } $var=!$var; } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index d7bfc9aed98..39b69ffb447 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -8,6 +8,7 @@ * Copyright (C) 2014 Cedric GROSS * Copyright (C) 2014-2015 Marcos García * Copyright (C) 2014-2015 Francis Appels + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +31,7 @@ */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php"; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; @@ -43,6 +45,7 @@ class Expedition extends CommonObject public $element="shipping"; public $fk_element="fk_expedition"; public $table_element="expedition"; + public $table_element_line="expeditiondet"; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $socid; @@ -167,11 +170,12 @@ class Expedition extends CommonObject * Create expedition en base * * @param User $user Objet du user qui cree + * @param int $notrigger 1=Does not execute triggers, 0= execuete triggers * @return int <0 si erreur, id expedition creee si ok */ - function create($user) + function create($user, $notrigger=0) { - global $conf, $langs; + global $conf, $langs, $hookmanager; $now=dol_now(); @@ -255,14 +259,14 @@ class Expedition extends CommonObject { if (! isset($this->lines[$i]->detail_batch)) { // no batch management - if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty) > 0) + if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0) { $error++; } } else { // with batch management - if (! $this->create_line_batch($this->lines[$i]) > 0) + if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0) { $error++; } @@ -284,8 +288,26 @@ class Expedition extends CommonObject $error++; } } + + // Actions on extra fields (by external module or standard code) + // TODO le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('expeditiondao')); + $parameters=array('socid'=>$this->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; - if (! $error) + if (! $error && ! $notrigger) { // Call trigger $result=$this->call_trigger('SHIPPING_CREATE',$user); @@ -340,10 +362,12 @@ class Expedition extends CommonObject * @param int $entrepot_id Id of warehouse * @param int $origin_line_id Id of source line * @param int $qty Quantity + * @param array $array_options extrafields array * @return int <0 if KO, >0 if OK */ - function create_line($entrepot_id, $origin_line_id, $qty) + function create_line($entrepot_id, $origin_line_id, $qty,$array_options=0) { + global $conf; $error = 0; $sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet ("; @@ -363,6 +387,19 @@ class Expedition extends CommonObject { $error++; } + + if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used + { + $expeditionline = new ExpeditionLigne($this->db); + $expeditionline->array_options=$array_options; + $expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element); + $result=$expeditionline->insertExtraFields(); + if ($result < 0) + { + $this->error[]=$expeditionline->error; + $error++; + } + } if (! $error) return 1; else return -1; @@ -373,13 +410,14 @@ class Expedition extends CommonObject * Create the detail (eat-by date) of the expedition line * * @param object $line_ext full line informations + * @param array $array_options extrafields array * @return int <0 if KO, >0 if OK */ - function create_line_batch($line_ext) + function create_line_batch($line_ext,$array_options=0) { $error = 0; - if ($this->create_line(($line_ext->entrepot_id?$line_ext->entrepot_id:'null'),$line_ext->origin_line_id,$line_ext->qty) < 0) + if ($this->create_line(($line_ext->entrepot_id?$line_ext->entrepot_id:'null'),$line_ext->origin_line_id,$line_ext->qty,$array_options) < 0) { $error++; } @@ -500,6 +538,13 @@ class Expedition extends CommonObject * Thirparty */ $result=$this->fetch_thirdparty(); + + // Retrieve all extrafields for expedition + // fetch optionals attributes and labels + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields=new ExtraFields($this->db); + $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); + $this->fetch_optionals($this->id,$extralabels); /* * Lines @@ -784,9 +829,10 @@ class Expedition extends CommonObject * @param int $entrepot_id Id of warehouse * @param int $id Id of source line (order line) * @param int $qty Quantity + * @param array $array_options extrafields array * @return int <0 if KO, >0 if OK */ - function addline($entrepot_id, $id, $qty) + function addline($entrepot_id, $id, $qty,$array_options=0) { global $conf, $langs; @@ -824,7 +870,11 @@ class Expedition extends CommonObject } } } - + + // extrafields + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used + $line->array_options = $array_options; + $this->lines[$num] = $line; } @@ -832,10 +882,13 @@ class Expedition extends CommonObject * Add a shipment line with batch record * * @param array $dbatch Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index) + * @param array $array_options extrafields array * @return int <0 if KO, >0 if OK */ - function addline_batch($dbatch) + function addline_batch($dbatch,$array_options=0) { + global $conf; + $num = count($this->lines); if ($dbatch['qty']>0) { @@ -872,6 +925,10 @@ class Expedition extends CommonObject $line->qty = $dbatch['qty']; $line->detail_batch=$tab; + // extrafields + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used + $line->array_options = $array_options; + //var_dump($line); $this->lines[$num] = $line; } @@ -1765,7 +1822,7 @@ class Expedition extends CommonObject /** * Classe de gestion des lignes de bons d'expedition */ -class ExpeditionLigne +class ExpeditionLigne extends CommonObjectLine { var $db; @@ -1790,6 +1847,9 @@ class ExpeditionLigne var $total_localtax1; // Total Local tax 1 var $total_localtax2; // Total Local tax 2 + public $element='expeditiondet'; + public $table_element='expeditiondet'; + public $fk_origin_line; // Deprecated diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql index 99a042c8c31..6def2432254 100755 --- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql +++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql @@ -315,6 +315,54 @@ create table llx_categorie_project import_key varchar(14) )ENGINE=innodb; + + + +-- Extrafields Expedition (shipment) +create table llx_expedition_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + +ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_object); + +create table llx_expeditiondet_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, -- object id + import_key varchar(14) -- import key +)ENGINE=innodb; + +ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafields (fk_object); + + + +-- Extrafields Expedition (delivery receipts) +create table llx_livraison_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + +ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_object); + +create table llx_livraisondet_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, -- object id + import_key varchar(14) -- import key +)ENGINE=innodb; + +ALTER TABLE llx_livraisondet_extrafields ADD INDEX idx_livraisondet_extrafields (fk_object); + + ALTER TABLE llx_categorie_project ADD PRIMARY KEY pk_categorie_project (fk_categorie, fk_project); ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (fk_categorie); ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project); diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql new file mode 100644 index 00000000000..b539f460a08 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql new file mode 100644 index 00000000000..eff8465fbf6 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql @@ -0,0 +1,26 @@ +-- ======================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ======================================================================== + +create table llx_expedition_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql new file mode 100644 index 00000000000..11e133442d5 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql new file mode 100644 index 00000000000..e27c7f3e505 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql @@ -0,0 +1,25 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +create table llx_expeditiondet_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, -- object id + import_key varchar(14) -- import key +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql new file mode 100644 index 00000000000..68e1f30bd15 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_livraison_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql new file mode 100644 index 00000000000..8a140496016 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql @@ -0,0 +1,26 @@ +-- ======================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ======================================================================== + +create table llx_livraison_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql new file mode 100644 index 00000000000..e3fcb9a0f23 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_livraisondet_extrafields ADD INDEX idx_livraisondet_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql new file mode 100644 index 00000000000..18295a90f5a --- /dev/null +++ b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql @@ -0,0 +1,25 @@ +-- =================================================================== +-- Copyright (C) 2015 Claudio Aschieri +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +create table llx_livraisondet_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, -- object id + import_key varchar(14) -- import key +)ENGINE=innodb; diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php index ec4feeb6bf9..c08c80536d7 100644 --- a/htdocs/livraison/card.php +++ b/htdocs/livraison/card.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Claudio Aschieri * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (! empty($conf->expedition_bon->enabled)) @@ -55,15 +57,17 @@ if ($user->societe_id) $socid=$user->societe_id; $result=restrictedArea($user,'expedition',$id,'livraison','livraison'); $object = new Livraison($db); +$extrafields = new ExtraFields($db); +$extrafieldsline = new ExtraFields($db); -// Load object -if ($id > 0 || ! empty($ref)) { - $ret = $object->fetch($id, $ref); - if ($ret > 0) - $ret = $object->fetch_thirdparty(); - if ($ret < 0) - dol_print_error('', $object->error); -} +// fetch optionals attributes and labels +$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); + +// fetch optionals attributes lines and labels +$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line); + +// Load object. Make an object->fetch +include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('deliverycard','globalcard')); @@ -181,6 +185,64 @@ elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); } +// Update extrafields +if ($action == 'update_extras') +{ + // Fill array 'array_options' with data from update form + $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); + $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute')); + if ($ret < 0) $error++; + + if (! $error) + { + // Actions on extra fields (by external module or standard code) + // TODO le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('livraisondao')); + $parameters = array('id' => $object->id); + $reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) { + $result = $object->insertExtraFields(); + if ($result < 0) { + $error++; + } + } else if ($reshook < 0) + $error++; + } + + if ($error) + $action = 'edit_extras'; +} + +// Extrafields line +if ($action == 'update_extras_line') +{ + $array_options=array(); + $num=count($object->lines); + + for ($i = 0; $i < $num; $i++) + { + // Extrafields + $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line); + $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i); + // Unset extrafield + if (is_array($extralabelsline)) { + // Get extra fields + foreach ($extralabelsline as $key => $value) { + unset($_POST["options_" . $key]); + } + } + + $ret = $object->update_line($object->lines[$i]->id,$array_options[$i]); // extrafields update + if ($ret < 0) + { + $mesg='
'.$object->error.'
'; + $error++; + } + } + +} + + /* * Build document */ @@ -502,6 +564,14 @@ else /* * Livraison */ + + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; // Shipment @@ -638,6 +708,10 @@ else print ''; print ''; } + + // Other attributes + $cols = 2; + include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; print "
'.$entrepot->libelle.'

\n"; @@ -727,11 +801,29 @@ else print ''.$object->lines[$i]->qty_shipped.''; print ""; + + //Display lines extrafields + if (is_array($extralabelslines) && count($extralabelslines)>0) { + $colspan=2; + $mode = ($object->statut == 0) ? 'edit' : 'view'; + $line = new LivraisonLigne($db); + $line->fetch_optionals($object->lines[$i]->id,$extralabelslines); + print ''; + print $line->showOptionals($extrafieldsline, $mode, array('style'=>$bc[$var], 'colspan'=>$colspan),$i); + print ''; + } $i++; } print "\n"; + + if($object->statut == 0) // only if draft + print '
'; + + print '
'; + + print "\n\n"; diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index f111d6b604d..faac4766337 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -42,6 +42,7 @@ class Livraison extends CommonObject public $element="delivery"; public $fk_element="fk_livraison"; public $table_element="livraison"; + public $table_element_line="livraisondet"; var $brouillon; var $socid; @@ -299,6 +300,14 @@ class Livraison extends CommonObject $this->db->free($result); if ($this->statut == 0) $this->brouillon = 1; + + + // Retrieve all extrafields for delivery + // fetch optionals attributes and labels + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + $extrafields=new ExtraFields($this->db); + $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); + $this->fetch_optionals($this->id,$extralabels); /* * Lignes @@ -523,7 +532,37 @@ class Livraison extends CommonObject return $this->create($user); } - + /** + * Update a livraison line (only extrafields) + * + * @param int $id Id of line (livraison line) + * @param array $array_options extrafields array + * @return int <0 if KO, >0 if OK + */ + function update_line($id, $array_options=0) + { + global $conf; + $error = 0; + + if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used + { + $livraisonline = new LivraisonLigne($this->db); + $livraisonline->array_options=$array_options; + $livraisonline->id=$id; + $result=$livraisonline->insertExtraFields(); + + if ($result < 0) + { + $this->error[]=$livraisonline->error; + $error++; + } + } + + if (! $error) return 1; + else return -1; + } + + /** * Add line * @@ -709,6 +748,7 @@ class Livraison extends CommonObject $obj = $this->db->fetch_object($resql); + $line->id = $obj->rowid; $line->label = $obj->custom_label; $line->description = $obj->description; $line->fk_product = $obj->fk_product; @@ -1006,6 +1046,8 @@ class Livraison extends CommonObject */ class LivraisonLigne extends CommonObjectLine { + var $db; + // From llx_expeditiondet var $qty; var $qty_asked; @@ -1028,6 +1070,9 @@ class LivraisonLigne extends CommonObjectLine public $product_ref; public $product_label; + + public $element='livraisondet'; + public $table_element='livraisondet'; /** * Constructor From 1ebe6fb9b52ffd0459adb7f54bad2f4940493804 Mon Sep 17 00:00:00 2001 From: cla Date: Wed, 16 Dec 2015 16:21:05 +0100 Subject: [PATCH 022/356] UPDATE: sendings EN_US lang file --- htdocs/langs/en_US/sendings.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 29567c24b37..bba305a9f0a 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -6,7 +6,7 @@ AllSendings=All Shipments Shipment=Shipment Shipments=Shipments ShowSending=Show Shipments -Receivings=Receipts +Receivings=Delivery Receipts SendingsArea=Shipments area ListOfSendings=List of shipments SendingMethod=Shipping method From b064d1106b2f64a58048460b47a73bbc84c47024 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 17 Dec 2015 06:16:29 +0100 Subject: [PATCH 023/356] Accountancy Add a list to select accounting account on product card --- .../class/html.formventilation.class.php | 2 +- htdocs/product/card.php | 83 +++++++++++++------ 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php index f92f5b3ab88..c4be176bf68 100644 --- a/htdocs/accountancy/class/html.formventilation.class.php +++ b/htdocs/accountancy/class/html.formventilation.class.php @@ -94,7 +94,7 @@ class FormVentilation extends Form * @param array $event Event options * @param int $select_in $selectid value is a aa.rowid (0 default) or aa.account_number (1) * @param int $select_out set value returned by select 0=rowid (default), 1=account_number - * @param int $aabase set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by + * @param int $aabase set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number * * @return string String with HTML select */ diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 77b14b24c7a..5f60724a135 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -43,9 +43,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; -if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; +if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; +if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/html.formventilation.class.php'; $langs->load("products"); $langs->load("other"); @@ -250,8 +252,11 @@ if (empty($reshook)) $object->volume_units = GETPOST('volume_units'); $object->finished = GETPOST('finished'); $object->fk_unit = GETPOST('units'); - $object->accountancy_code_sell = GETPOST('accountancy_code_sell'); - $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); + + if (GETPOST('accountancy_code_sell') <= 0) { $accountancy_code_sell = ''; } else { $accountancy_code_sell = GETPOST('accountancy_code_sell'); } + if (GETPOST('accountancy_code_buy') <= 0) { $accountancy_code_buy = ''; } else { $accountancy_code_buy = GETPOST('accountancy_code_buy'); } + $object->accountancy_code_sell = $accountancy_code_sell; + $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); // MultiPrix if (! empty($conf->global->PRODUIT_MULTIPRICES)) @@ -719,6 +724,7 @@ llxHeader('', $title, $helpurl); $form = new Form($db); $formproduct = new FormProduct($db); +if (! empty($conf->accounting->enabled)) $formaccountancy = New FormVentilation($db); if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) @@ -1003,20 +1009,34 @@ else } print ''; + + if (! empty($conf->accounting->enabled)) + { + // Accountancy_code_sell + print ''; + print ''; - // Accountancy_code_sell - print ''; - print ''; + // Accountancy_code_buy + print ''; + print ''; + } + else // For external software + { + // Accountancy_code_sell + print ''; + print ''; - // Accountancy_code_buy - print ''; - print ''; - - print '
'.$langs->trans("ProductAccountancySellCode").''; + print $formaccountancy->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 0, 1); + print '
'.$langs->trans("ProductAccountancySellCode").''; - print '
'.$langs->trans("ProductAccountancyBuyCode").''; + print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 0, 1); + print '
'.$langs->trans("ProductAccountancySellCode").''; + print '
'.$langs->trans("ProductAccountancyBuyCode").''; - print '
'; - - print '
'; + // Accountancy_code_buy + print ''.$langs->trans("ProductAccountancyBuyCode").''; + print ''; + print ''; + } + print ''; dol_fiche_end(); @@ -1263,14 +1283,24 @@ else print '
'; - /*if (empty($conf->accounting->enabled) && empty($conf->comptabilite->enabled) && empty($conf->accountingexpert->enabled)) - { - // Don't show accounting field when accounting id disabled. - } - else - {*/ - print ''; + print '
'; + if (! empty($conf->accounting->enabled)) + { + // Accountancy_code_sell + print ''; + print ''; + + // Accountancy_code_buy + print ''; + print ''; + } + else // For external software + { // Accountancy_code_sell print ''; print ''; print ''; - - print '
'.$langs->trans("ProductAccountancySellCode").''; + print $formaccountancy->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1); + print '
'.$langs->trans("ProductAccountancyBuyCode").''; + print $formaccountancy->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1); + print '
'.$langs->trans("ProductAccountancySellCode").''; @@ -1280,9 +1310,8 @@ else print '
'.$langs->trans("ProductAccountancyBuyCode").''; print '
'; - //} + } + print ''; dol_fiche_end(); From c2642acdba5716dbd65ded8231d7ecef294998c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 17 Dec 2015 10:01:21 +0100 Subject: [PATCH 024/356] Fix CI build 578 (Syntax error) empty() only supports variables in PHP < 5.5 --- htdocs/product/card.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index bdb19e39a6d..ba548cacd26 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -64,6 +64,8 @@ $action=(GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view'); $cancel=GETPOST('cancel'); $confirm=GETPOST('confirm','alpha'); $socid=GETPOST('socid','int'); +$duration_value = GETPOST('duration_value'); +$duration_unit = GETPOST('duration_unit'); if (! empty($user->societe_id)) $socid=$user->societe_id; $object = new Product($db); @@ -184,7 +186,7 @@ if (empty($reshook)) $action = "create"; $error++; } - if (! empty(GETPOST('duration_value')) && empty(GETPOST('duration_unit'))) + if (! empty($duration_value) && empty($duration_unit)) { setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), 'errors'); $action = "create"; @@ -242,8 +244,8 @@ if (empty($reshook)) $object->note = dol_htmlcleanlastbr(GETPOST('note')); $object->customcode = GETPOST('customcode'); $object->country_id = GETPOST('country_id'); - $object->duration_value = GETPOST('duration_value'); - $object->duration_unit = GETPOST('duration_unit'); + $object->duration_value = $duration_value; + $object->duration_unit = $duration_unit; $object->seuil_stock_alerte = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0; $object->desiredstock = GETPOST('desiredstock')?GETPOST('desiredstock'):0; $object->canvas = GETPOST('canvas'); @@ -329,8 +331,8 @@ if (empty($reshook)) $object->status_batch = GETPOST('status_batch'); $object->seuil_stock_alerte = GETPOST('seuil_stock_alerte'); $object->desiredstock = GETPOST('desiredstock'); - $object->duration_value = GETPOST('duration_value'); - $object->duration_unit = GETPOST('duration_unit'); + $object->duration_value = $duration_value; + $object->duration_unit = $duration_unit; $object->canvas = GETPOST('canvas'); $object->weight = GETPOST('weight'); $object->weight_units = GETPOST('weight_units'); @@ -898,7 +900,7 @@ else // Duration if ($type == 1) { - print ''.$langs->trans("Duration").'  '; + print '' . $langs->trans("Duration") . '  '; print ''.$langs->trans("Hour").' '; print ''.$langs->trans("Day").' '; print ''.$langs->trans("Week").' '; From e6ec797af8e90ff5ec60135122cdc8561003f425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 17 Dec 2015 10:21:44 +0100 Subject: [PATCH 025/356] FIX #4242 Allow disabling dashes in documents --- htdocs/core/modules/commande/doc/pdf_einstein.modules.php | 2 +- htdocs/core/modules/commande/doc/pdf_proforma.modules.php | 2 +- htdocs/core/modules/expedition/doc/pdf_merou.modules.php | 2 +- htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php | 2 +- htdocs/core/modules/project/pdf/pdf_baleine.modules.php | 2 +- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 2 +- .../core/modules/supplier_invoice/pdf/pdf_canelle.modules.php | 2 +- htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 2f569f1e47f..acb2114c351 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -419,7 +419,7 @@ class pdf_einstein extends ModelePDFCommandes $this->tva[$vatrate] += $tvaligne; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index cf5a562e2ef..fc880b91a6e 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -418,7 +418,7 @@ class pdf_proforma extends ModelePDFCommandes $this->tva[$vatrate] += $tvaligne; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 8fab26f211c..e19ef0a2c49 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -265,7 +265,7 @@ class pdf_merou extends ModelePdfExpedition $pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0); // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 12fd723bf9b..cd8ddaf0a57 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -272,7 +272,7 @@ class pdf_rouget extends ModelePdfExpedition $pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped,'','C'); // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index e8ea460fb9b..eb8e43b6f7c 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -420,7 +420,7 @@ class pdf_crabe extends ModelePDFFactures $this->tva[$vatrate] += $tvaligne; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php index ba58279c8ec..4e0dbbacae5 100644 --- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php @@ -377,7 +377,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder */ // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblines - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php index d8f2d744e78..90dd563c620 100644 --- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php @@ -228,7 +228,7 @@ class pdf_baleine extends ModelePDFProjects $nexY = $pdf->GetY(); // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index d7d4b3150cf..8f24283448b 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -476,7 +476,7 @@ class pdf_azur extends ModelePDFPropales if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index e45f45cb79b..e5e3284e99a 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -386,7 +386,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $this->localtax2[$localtax2rate]+=$localtax2ligne; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 5376d7fcd27..3379ae18b14 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -410,7 +410,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); From 02e053acc63916dc203ac16282210b40cbd0d44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 17 Dec 2015 10:26:27 +0100 Subject: [PATCH 026/356] FIX #4242 Allow disabling dashes in documents 3.7 specific fix since document files have moved --- htdocs/core/modules/livraison/doc/pdf_typhon.modules.php | 2 +- htdocs/core/modules/project/doc/pdf_baleine.modules.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index 365fbef4cdf..340882a3e5a 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -395,7 +395,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder */ // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblines - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php index db0017a2e98..c40b8bb93a1 100644 --- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php @@ -242,7 +242,7 @@ class pdf_baleine extends ModelePDFProjects $nexY = $pdf->GetY(); // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); From 7e98cfd5b678385ef1b5e01f00a9e5cf4d7393ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 17 Dec 2015 10:33:12 +0100 Subject: [PATCH 027/356] FIX #4242 Allow disabling dashes in documents 3.8 specific fix for new documents --- htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php index db021bcb89e..6729ea2a60c 100644 --- a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php @@ -490,7 +490,7 @@ class pdf_aurore extends ModelePDFAskPriceSupplier if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210))); From 4f9ab7da24bb2caf72b3043854e5773f58eaaf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 17 Dec 2015 10:39:48 +0100 Subject: [PATCH 028/356] FIX #4242 Allow disabling dashes in documents 3.9 specific fix since document have moved --- .../core/modules/supplier_proposal/doc/pdf_aurore.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index 4a14998d0c4..67f07ee1d1c 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -494,7 +494,7 @@ class pdf_aurore extends ModelePDFSupplierProposal if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage; // Add line - if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) + if ($conf->global->MAIN_PDF_DASH_BETWEEN_LINES && $i < ($nblignes - 1)) { $pdf->setPage($pageposafter); $pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80))); From 21f7271e5177316d3ed7779dbafae20ae49d5a00 Mon Sep 17 00:00:00 2001 From: fmarcet Date: Thu, 17 Dec 2015 12:36:43 +0100 Subject: [PATCH 029/356] FIX: Not deleting contrats on element_element table --- htdocs/contrat/class/contrat.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 3e4605a8f2c..39acbe6a7df 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2013 Christophe Battarel * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -861,6 +862,13 @@ class Contrat extends CommonObject } } + if (! $error) + { + // Delete linked object + $res = $this->deleteObjectLinked(); + if ($res < 0) $error++; + } + if (! $error) { // Delete contratdet_log From 85f87d45df929125e993da36d9cf2e7e242af316 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 17 Dec 2015 12:57:08 +0100 Subject: [PATCH 030/356] Add select account in product card --- .../class/html.formventilation.class.php | 4 +-- htdocs/product/card.php | 30 ++++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php index c4be176bf68..5ff125b0ba2 100644 --- a/htdocs/accountancy/class/html.formventilation.class.php +++ b/htdocs/accountancy/class/html.formventilation.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2013-2014 Olivier Geffroy - * Copyright (C) 2013-2014 Alexandre Spangaro + * Copyright (C) 2013-2015 Alexandre Spangaro * Copyright (C) 2015 Ari Elbaz (elarifr) * * This program is free software; you can redistribute it and/or modify @@ -126,7 +126,7 @@ class FormVentilation extends Form if ($num) { while ( $i < $num ) { $obj = $this->db->fetch_object($resql); - $label = $obj->account_number . ' - ' . $obj->label; + $label = length_accountg($obj->account_number) . ' - ' . $obj->label; $label = dol_trunc($label, $trunclength); if ($select_in == 0 ) $select_value_in = $obj->rowid; if ($select_in == 1 ) $select_value_in = $obj->account_number; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 80deacdea88..3fce17da770 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -186,12 +186,14 @@ if (empty($reshook)) $action = "create"; $error++; } + /* if (! empty(GETPOST('duration_value')) && empty(GETPOST('duration_unit'))) { setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), 'errors'); $action = "create"; $error++; } + */ if (! $error) { @@ -263,7 +265,7 @@ if (empty($reshook)) if (GETPOST('accountancy_code_sell') <= 0) { $accountancy_code_sell = ''; } else { $accountancy_code_sell = GETPOST('accountancy_code_sell'); } if (GETPOST('accountancy_code_buy') <= 0) { $accountancy_code_buy = ''; } else { $accountancy_code_buy = GETPOST('accountancy_code_buy'); } $object->accountancy_code_sell = $accountancy_code_sell; - $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); + $object->accountancy_code_buy = $accountancy_code_buy; // MultiPrix if (! empty($conf->global->PRODUIT_MULTIPRICES)) @@ -372,6 +374,8 @@ if (empty($reshook)) $object->barcode_type_coder = $stdobject->barcode_type_coder; $object->barcode_type_label = $stdobject->barcode_type_label; + if (GETPOST('accountancy_code_sell') <= 0) { $accountancy_code_sell = ''; } else { $accountancy_code_sell = GETPOST('accountancy_code_sell'); } + if (GETPOST('accountancy_code_buy') <= 0) { $accountancy_code_buy = ''; } else { $accountancy_code_buy = GETPOST('accountancy_code_buy'); } $object->accountancy_code_sell = GETPOST('accountancy_code_sell'); $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); @@ -1367,7 +1371,7 @@ else print ''; print ''; if (($action != 'editbarcodetype') && ! empty($user->rights->barcode->creer)) print ''; print '
'; print $langs->trans("BarcodeType"); - print ''; + print 'id.'">'.img_edit($langs->trans('Edit'),1).'
'; print ''; @@ -1388,7 +1392,7 @@ else print ''; print ''; if (($action != 'editbarcode') && ! empty($user->rights->barcode->creer)) print ''; print '
'; print $langs->trans("BarcodeValue"); - print ''; + print 'id.'">'.img_edit($langs->trans('Edit'),1).'
'; print ''; @@ -1409,13 +1413,23 @@ else } // Accountancy sell code - print ''.$form->editfieldkey("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').''; - print $form->editfieldval("ProductAccountancySellCode",'accountancy_code_sell',$object->accountancy_code_sell,$object,$user->rights->produit->creer||$user->rights->service->creer,'string'); + print ''; + print ''; + print '
'; + print $langs->trans("ProductAccountancySellCode"); + print '
'; + print ''; + print length_accountg($object->accountancy_code_sell); print ''; - // Accountancy buy code - print ''.$form->editfieldkey("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string').''; - print $form->editfieldval("ProductAccountancyBuyCode",'accountancy_code_buy',$object->accountancy_code_buy,$object,$user->rights->produit->creer||$user->rights->service->creer,'string'); + // Accountancy sell code + print ''; + print ''; + print '
'; + print $langs->trans("ProductAccountancyBuyCode"); + print '
'; + print ''; + print length_accountg($object->accountancy_code_buy); print ''; // Status (to sell) From ea73e0253c85ed51664e06ffaff275e08ee6f122 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 17 Dec 2015 13:09:46 +0100 Subject: [PATCH 031/356] Move fiscal year from accountancy module to configuration of Dolibarr --- htdocs/core/menus/init_menu_auguria.sql | 4 ++-- htdocs/core/menus/standard/eldy.lib.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 9f583ed4c04..e3446998ac2 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -23,7 +23,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 2, 4, __ENTITY__); - +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 115__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=setup', 'Fiscalyear', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/translation.php?leftmenu=setup', 'Translation', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?leftmenu=setup', 'Modules', 1, 'admin', '', '', 2, 2, __ENTITY__); @@ -228,7 +228,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2721__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyyear.php', 'ByYear', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="bookkeeping"', __HANDLER__, 'left', 2722__+MAX_llx_menu__, 'accountancy', '', 2720__+MAX_llx_menu__, '/accountancy/bookkeeping/balancebymonth.php', 'AccountBalanceByMonth', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 1, __ENTITY__); -- Fiscal year & Chart of accounts -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'accountancy', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__); +-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2750__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?leftmenu=setup', 'Fiscalyear', 1, 'accountancy', '$user->rights->accounting->fiscalyear', '', 2, 20, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2751__+MAX_llx_menu__, 'home', '', 6__+MAX_llx_menu__, '/accountancy/admin/account.php?mainmenu=accountancy', 'Chartofaccounts', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 2, 21, __ENTITY__); -- Check deposit insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index a04448b60d6..76d2331cb87 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -499,6 +499,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto,1); $newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"),1); $newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"),1); + $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=home", $langs->trans("Fiscalyear"),1); + if (! in_array($langs->defaultlang,array('en_US'))) { $newmenu->add("/admin/translation.php", $langs->trans("Translation"),1); @@ -1010,7 +1012,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu // Setup if (! empty($conf->accounting->enabled)) { - $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear'); + // $newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy", $langs->trans("Fiscalyear"),0,$user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear'); $newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy", $langs->trans("Chartofaccounts"),0,$user->rights->accounting->chartofaccount, '', $mainmenu, 'chartofaccount'); } } From c9d6607b04edc23a1797d1882bc074ebbf5a3afa Mon Sep 17 00:00:00 2001 From: philippe grand Date: Thu, 17 Dec 2015 14:14:44 +0100 Subject: [PATCH 032/356] [Qual] Uniformize code --- htdocs/product/card.php | 2 +- htdocs/projet/activity/perday.php | 6 +++--- htdocs/projet/activity/perweek.php | 6 +++--- htdocs/projet/admin/project.php | 20 ++++++++++---------- htdocs/projet/card.php | 16 ++++++++-------- htdocs/projet/contact.php | 4 ++-- htdocs/projet/element.php | 14 +++++++++----- htdocs/projet/tasks/contact.php | 4 ++-- htdocs/projet/tasks/task.php | 4 ++-- htdocs/projet/tasks/time.php | 18 +++++++++--------- 10 files changed, 49 insertions(+), 45 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index bdb19e39a6d..91ae9c86f16 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -186,7 +186,7 @@ if (empty($reshook)) } if (! empty(GETPOST('duration_value')) && empty(GETPOST('duration_unit'))) { - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), 'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('Unit')), null, 'errors'); $action = "create"; $error++; } diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 5af9e9d57c3..1cda2b97f68 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -116,7 +116,7 @@ if ($action == 'assign') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings'); } else { @@ -195,7 +195,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) if (! $error) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); // Redirect to avoid submit twice on back header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday); @@ -204,7 +204,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) } else { - setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); + setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors'); } } diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 8a65dfe4162..cef0f2ebf8b 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -129,7 +129,7 @@ if ($action == 'assign') if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'warnings'); } else { @@ -150,7 +150,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) $timetoadd=$_POST['task']; if (empty($timetoadd)) { - setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); + setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors'); } else { @@ -189,7 +189,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) if (! $error) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); // Redirect to avoid submit twice on back header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'')); diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 400560d0040..6c99461b353 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -71,11 +71,11 @@ else if ($action == 'updateMask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -90,11 +90,11 @@ if ($action == 'updateMaskTask') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans("Error"), 'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } @@ -132,13 +132,13 @@ else if ($action == 'specimen') } else { - setEventMessage($obj->error, 'errors'); + setEventMessages($obj->error, $obj->errors, 'errors'); dol_syslog($obj->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -177,13 +177,13 @@ else if ($action == 'specimentask') } else { - setEventMessage($obj->error, 'errors'); + setEventMessages($obj->error, $obj->errors, 'errors'); dol_syslog($obj->error, LOG_ERR); } } else { - setEventMessage($langs->trans("ErrorModuleNotFound"), 'errors'); + setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors'); dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR); } } @@ -208,12 +208,12 @@ if ($action == 'setModuleOptions') if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { $db->rollback(); - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 463cda3953c..6a94c4dce17 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -101,7 +101,7 @@ if (empty($reshook)) else { dol_syslog($object->error,LOG_DEBUG); - setEventMessage($langs->trans("CantRemoveProject"), 'errors'); + setEventMessages($langs->trans("CantRemoveProject"), null, 'errors'); } } if ($backtopage) @@ -158,14 +158,14 @@ if (empty($reshook)) if ($result < 0) { $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($langs->trans($object->error), null,s 'errors'); $error++; } } else { $langs->load("errors"); - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessage($langs->trans($object->error), null, 'errors'); $error++; } @@ -241,7 +241,7 @@ if (empty($reshook)) if ($object->opp_amount && ($object->opp_status <= 0)) { $error++; - setEventMessage($langs->trans("ErrorOppStatusRequiredIfAmount"),'errors'); + setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors'); } if (! $error) @@ -262,7 +262,7 @@ if (empty($reshook)) if ($result < 0) { $error++; - setEventMessage($langs->trans("ErrorShiftTaskDate").':'.$object->error, 'errors'); + setEventMessages($langs->trans("ErrorShiftTaskDate").':'.$object->error, $langs->trans("ErrorShiftTaskDate").':'.$object->errors, 'errors'); } } } @@ -313,8 +313,8 @@ if (empty($reshook)) $urlfile=GETPOST('urlfile','alpha'); $file = $upload_dir . '/' . $filetodelete; $ret=dol_delete_file($file); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", $urlfile)); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", $urlfile), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors'); } } @@ -352,7 +352,7 @@ if (empty($reshook)) $result=$object->delete($user); if ($result > 0) { - setEventMessage($langs->trans("RecordDeleted"), 'info'); + setEventMessagess($langs->trans("RecordDeleted"), null, 'mesgs'); header("Location: index.php"); exit; } diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index f2d44e74dca..ebfad425cf8 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -76,11 +76,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer) if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index ff3e3c32218..3839a9b0b06 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -293,17 +293,21 @@ if ($action=="addelement") $tablename = GETPOST("tablename"); $elementselectid = GETPOST("elementselect"); $result=$object->update_element($tablename, $elementselectid); - if ($result<0) { - setEventMessage($object->error,'errors'); + if ($result<0) + { + setEventMessages($object->error, $object->errors, 'errors'); } -}elseif ($action == "unlink") { +} +elseif ($action == "unlink") +{ $tablename = GETPOST("tablename"); $elementselectid = GETPOST("elementselect"); $result = $object->remove_element($tablename, $elementselectid); - if ($result < 0) { - setEventMessage($object->error, 'errors'); + if ($result < 0) + { + setEventMessages($object->error, $object->errors, 'errors'); } } diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 787bc8e120a..0faf21c1cc2 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -94,11 +94,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer) if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); - setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors'); + setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 32ede58a534..3804715cb7c 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -180,8 +180,8 @@ if ($action == 'remove_file' && $user->rights->projet->creer) $file = $upload_dir . '/' . GETPOST('file'); $ret=dol_delete_file($file); - if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); - else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); + if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); + else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); } } diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 51dafba2a6d..ac0adf33c77 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -61,13 +61,13 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) $timespent_durationmin = GETPOST('timespent_durationmin','int'); if (empty($timespent_durationhour) && empty($timespent_durationmin)) { - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors'); $error++; } if (empty($_POST["userid"])) { $langs->load("errors"); - setEventMessage($langs->trans('ErrorUserNotAssignedToTask'),'errors'); + setEventMessages($langs->trans('ErrorUserNotAssignedToTask'), null, 'errors'); $error++; } @@ -78,7 +78,7 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) if (empty($object->projet->statut)) { - setEventMessage($langs->trans("ProjectMustBeValidatedFirst"),'errors'); + setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors'); $error++; } else @@ -100,11 +100,11 @@ if ($action == 'addtimespent' && $user->rights->projet->creer) $result=$object->addTimeSpent($user); if ($result >= 0) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans($object->error),'errors'); + setEventMessages($langs->trans($object->error), null, 'errors'); $error++; } } @@ -121,7 +121,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"])) { - setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors'); + setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")), null, 'errors'); $error++; } @@ -148,11 +148,11 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree $result=$object->updateTimeSpent($user); if ($result >= 0) { - setEventMessage($langs->trans("RecordSaved")); + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); } else { - setEventMessage($langs->trans($object->error),'errors'); + setEventMessages($langs->trans($object->error), null, 'errors'); $error++; } } @@ -170,7 +170,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->c if ($result < 0) { $langs->load("errors"); - setEventMessage($langs->trans($object->error),'errors'); + setEventMessages($langs->trans($object->error), null, 'errors'); $error++; $action=''; } From 367d9de0b7f189248c3001f54bde49b5046df643 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Thu, 17 Dec 2015 17:12:28 +0100 Subject: [PATCH 033/356] fix some translation --- htdocs/core/modules/DolibarrModules.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 504b5cb7e4c..d3d81ed7723 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -32,7 +32,7 @@ * * Parent class for module descriptor class files */ -class DolibarrModules // Can not be abstract, because we need to instantiant it into unActivateModule to be able to disable a module whose files were removed. +class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed. { /** * @var DoliDb Database handler @@ -432,7 +432,7 @@ class DolibarrModules // Can not be abstract, because we need to insta } else { - // If module description translation using it's unique id does not exists, we take use its name to find translation + // If module description translation does not exist using its unique id, we can use its name to find translation if (is_array($this->langfiles)) { foreach($this->langfiles as $val) @@ -510,12 +510,12 @@ class DolibarrModules // Can not be abstract, because we need to insta $langstring="ExportDataset_".$this->export_code[$r]; if ($langs->trans($langstring) == $langstring) { - // Traduction non trouvee + // Translation not found return $langs->trans($this->export_label[$r]); } else { - // Traduction trouvee + // Translation found return $langs->trans($langstring); } } @@ -536,12 +536,12 @@ class DolibarrModules // Can not be abstract, because we need to insta //print "x".$langstring; if ($langs->trans($langstring) == $langstring) { - // Traduction non trouvee + // Translation not found return $langs->trans($this->import_label[$r]); } else { - // Traduction trouvee + // Translation found return $langs->trans($langstring); } } @@ -1223,7 +1223,7 @@ print $sql; $obj=$this->db->fetch_object($resql); if ($obj !== null && ! empty($obj->value) && ! empty($this->rights)) { - // Si module actif + // If the module is active foreach ($this->rights as $key => $value) { $r_id = $this->rights[$key][0]; From cdc408a84cb6b02ad6ecca6486bcb3f68730a3e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 17 Dec 2015 17:16:26 +0100 Subject: [PATCH 034/356] Fix: button "now" was not working on date using no javascript --- htdocs/core/class/html.form.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 549959bd561..552eed53a94 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4164,7 +4164,7 @@ class Form else { // Day - $retstring.=''; + $retstring.=''; if ($emptydate || $set_time == -1) { @@ -4178,7 +4178,7 @@ class Form $retstring.=""; - $retstring.=''; + $retstring.=''; if ($emptydate || $set_time == -1) { $retstring.=''; @@ -4196,11 +4196,11 @@ class Form // Year if ($emptydate || $set_time == -1) { - $retstring.=''; + $retstring.=''; } else { - $retstring.=''; + $retstring.=''; for ($year = $syear - 5; $year < $syear + 10 ; $year++) { From b91031b6938a8880e93d39d71daadda74f0ef5a1 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Thu, 17 Dec 2015 17:20:28 +0100 Subject: [PATCH 035/356] fix some issue within my last commit --- htdocs/projet/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 6a94c4dce17..031239f1a85 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -158,7 +158,7 @@ if (empty($reshook)) if ($result < 0) { $langs->load("errors"); - setEventMessages($langs->trans($object->error), null,s 'errors'); + setEventMessages($langs->trans($object->error), null, 'errors'); $error++; } } From 6e45ad92fa1f4c33dc20432f657162e8424a1227 Mon Sep 17 00:00:00 2001 From: philippe grand Date: Thu, 17 Dec 2015 17:35:30 +0100 Subject: [PATCH 036/356] fix some issue within setEventMessages attribut --- htdocs/admin/barcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index fbaf68a96d9..2fbd3de6a0f 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -97,7 +97,7 @@ if ($action == 'setModuleOptions') if (! $error) { - setEventMessages($langs->trans("SetupSaved"), null, 'msgs'); + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { From fd2b90ac753b91216f3e43f2d95f78c89ee36dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 10 Dec 2015 17:24:29 +0100 Subject: [PATCH 037/356] [Qual] Added development tools to composer --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index 583e08078af..7713badd313 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,12 @@ "restler/framework": "^3.0", "tecnickcom/tcpdf": "6.2.12" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "^0", + "jakub-onderka/php-console-highlighter": "^0", + "phpunit/phpunit": "^4", + "squizlabs/php_codesniffer": "^2" + }, "suggest": { "ext-mysqlnd": "To use with MySQL or MariaDB", "ext-mysqli": "To use with MySQL or MariaDB", From b446aef192edfddd3b9e071865f9440c40a2bc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 10 Dec 2015 17:40:41 +0100 Subject: [PATCH 038/356] FIX #3868 Upgraded ckeditor to 4.5.6 --- COPYRIGHT | 2 +- composer.json | 2 +- composer.lock | 1128 +++++++++- htdocs/includes/ckeditor/ckeditor/CHANGES.md | 599 ++++- htdocs/includes/ckeditor/ckeditor/LICENSE.md | 162 +- .../ckeditor/ckeditor/adapters/jquery.js | 14 +- htdocs/includes/ckeditor/ckeditor/bower.json | 2 +- .../ckeditor/ckeditor/build-config.js | 26 +- htdocs/includes/ckeditor/ckeditor/ckeditor.js | 1977 +++++++++-------- htdocs/includes/ckeditor/ckeditor/config.js | 4 +- .../includes/ckeditor/ckeditor/contents.css | 17 +- htdocs/includes/ckeditor/ckeditor/lang/af.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ar.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bg.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/bs.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ca.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/cs.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/cy.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/da.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/de.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/el.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-au.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-ca.js | 6 +- .../includes/ckeditor/ckeditor/lang/en-gb.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/en.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/eo.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/es.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/et.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/eu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fa.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fi.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fo.js | 6 +- .../includes/ckeditor/ckeditor/lang/fr-ca.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/fr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/gl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/gu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/he.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hi.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/hu.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/id.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/is.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/it.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ja.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ka.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/km.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ko.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ku.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/lt.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/lv.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/mk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/mn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ms.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/nb.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/nl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/no.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/pl.js | 6 +- .../includes/ckeditor/ckeditor/lang/pt-br.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/pt.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ro.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/ru.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/si.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sl.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sq.js | 6 +- .../ckeditor/ckeditor/lang/sr-latn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/sv.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/th.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/tr.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/tt.js | 5 + htdocs/includes/ckeditor/ckeditor/lang/ug.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/uk.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/vi.js | 6 +- .../includes/ckeditor/ckeditor/lang/zh-cn.js | 6 +- htdocs/includes/ckeditor/ckeditor/lang/zh.js | 6 +- .../plugins/a11yhelp/dialogs/a11yhelp.js | 10 +- .../dialogs/lang/_translationstatus.txt | 2 +- .../plugins/a11yhelp/dialogs/lang/af.js | 11 + .../plugins/a11yhelp/dialogs/lang/ar.js | 10 +- .../plugins/a11yhelp/dialogs/lang/bg.js | 8 +- .../plugins/a11yhelp/dialogs/lang/ca.js | 19 +- .../plugins/a11yhelp/dialogs/lang/cs.js | 19 +- .../plugins/a11yhelp/dialogs/lang/cy.js | 8 +- .../plugins/a11yhelp/dialogs/lang/da.js | 16 +- .../plugins/a11yhelp/dialogs/lang/de.js | 18 +- .../plugins/a11yhelp/dialogs/lang/el.js | 9 +- .../plugins/a11yhelp/dialogs/lang/en-gb.js | 8 +- .../plugins/a11yhelp/dialogs/lang/en.js | 8 +- .../plugins/a11yhelp/dialogs/lang/eo.js | 17 +- .../plugins/a11yhelp/dialogs/lang/es.js | 16 +- .../plugins/a11yhelp/dialogs/lang/et.js | 8 +- .../plugins/a11yhelp/dialogs/lang/eu.js | 12 + .../plugins/a11yhelp/dialogs/lang/fa.js | 8 +- .../plugins/a11yhelp/dialogs/lang/fi.js | 13 +- .../plugins/a11yhelp/dialogs/lang/fo.js | 11 + .../plugins/a11yhelp/dialogs/lang/fr-ca.js | 9 +- .../plugins/a11yhelp/dialogs/lang/fr.js | 11 +- .../plugins/a11yhelp/dialogs/lang/gl.js | 16 +- .../plugins/a11yhelp/dialogs/lang/gu.js | 8 +- .../plugins/a11yhelp/dialogs/lang/he.js | 12 +- .../plugins/a11yhelp/dialogs/lang/hi.js | 8 +- .../plugins/a11yhelp/dialogs/lang/hr.js | 8 +- .../plugins/a11yhelp/dialogs/lang/hu.js | 7 +- .../plugins/a11yhelp/dialogs/lang/id.js | 8 +- .../plugins/a11yhelp/dialogs/lang/it.js | 15 +- .../plugins/a11yhelp/dialogs/lang/ja.js | 4 +- .../plugins/a11yhelp/dialogs/lang/km.js | 14 +- .../plugins/a11yhelp/dialogs/lang/ko.js | 14 +- .../plugins/a11yhelp/dialogs/lang/ku.js | 13 +- .../plugins/a11yhelp/dialogs/lang/lt.js | 8 +- .../plugins/a11yhelp/dialogs/lang/lv.js | 9 +- .../plugins/a11yhelp/dialogs/lang/mk.js | 8 +- .../plugins/a11yhelp/dialogs/lang/mn.js | 8 +- .../plugins/a11yhelp/dialogs/lang/nb.js | 15 +- .../plugins/a11yhelp/dialogs/lang/nl.js | 9 +- .../plugins/a11yhelp/dialogs/lang/no.js | 8 +- .../plugins/a11yhelp/dialogs/lang/pl.js | 12 +- .../plugins/a11yhelp/dialogs/lang/pt-br.js | 18 +- .../plugins/a11yhelp/dialogs/lang/pt.js | 18 +- .../plugins/a11yhelp/dialogs/lang/ro.js | 11 +- .../plugins/a11yhelp/dialogs/lang/ru.js | 12 +- .../plugins/a11yhelp/dialogs/lang/si.js | 8 +- .../plugins/a11yhelp/dialogs/lang/sk.js | 15 +- .../plugins/a11yhelp/dialogs/lang/sl.js | 9 +- .../plugins/a11yhelp/dialogs/lang/sq.js | 14 +- .../plugins/a11yhelp/dialogs/lang/sr-latn.js | 8 +- .../plugins/a11yhelp/dialogs/lang/sr.js | 8 +- .../plugins/a11yhelp/dialogs/lang/sv.js | 17 +- .../plugins/a11yhelp/dialogs/lang/th.js | 8 +- .../plugins/a11yhelp/dialogs/lang/tr.js | 14 +- .../plugins/a11yhelp/dialogs/lang/tt.js | 11 + .../plugins/a11yhelp/dialogs/lang/ug.js | 11 +- .../plugins/a11yhelp/dialogs/lang/uk.js | 8 +- .../plugins/a11yhelp/dialogs/lang/vi.js | 12 +- .../plugins/a11yhelp/dialogs/lang/zh-cn.js | 6 +- .../plugins/a11yhelp/dialogs/lang/zh.js | 13 +- .../ckeditor/plugins/about/dialogs/about.js | 8 +- .../plugins/clipboard/dialogs/paste.js | 17 +- .../colordialog/dialogs/colordialog.js | 20 +- .../plugins/dialog/dialogDefinition.js | 2 +- .../ckeditor/plugins/div/dialogs/div.js | 16 +- .../plugins/fakeobjects/images/spacer.gif | Bin 43 -> 0 bytes .../ckeditor/plugins/find/dialogs/find.js | 42 +- .../ckeditor/plugins/flash/dialogs/flash.js | 28 +- .../ckeditor/plugins/forms/dialogs/button.js | 4 +- .../plugins/forms/dialogs/checkbox.js | 7 +- .../ckeditor/plugins/forms/dialogs/form.js | 8 +- .../plugins/forms/dialogs/hiddenfield.js | 9 +- .../ckeditor/plugins/forms/dialogs/radio.js | 11 +- .../ckeditor/plugins/forms/dialogs/select.js | 30 +- .../plugins/forms/dialogs/textarea.js | 6 +- .../plugins/forms/dialogs/textfield.js | 11 +- .../plugins/forms/images/hiddenfield.gif | Bin 105 -> 178 bytes .../ckeditor/ckeditor/plugins/icons.png | Bin 20643 -> 20634 bytes .../ckeditor/plugins/iframe/dialogs/iframe.js | 6 +- .../plugins/iframe/images/placeholder.png | Bin 449 -> 265 bytes .../ckeditor/plugins/image/dialogs/image.js | 81 +- .../ckeditor/plugins/image/images/noimage.png | Bin 2115 -> 1610 bytes .../ckeditor/plugins/link/dialogs/anchor.js | 9 +- .../ckeditor/plugins/link/dialogs/link.js | 55 +- .../ckeditor/plugins/link/images/anchor.png | Bin 763 -> 589 bytes .../plugins/link/images/hidpi/anchor.png | Bin 1597 -> 1379 bytes .../plugins/liststyle/dialogs/liststyle.js | 14 +- .../magicline/images/hidpi/icon-rtl.png | Bin 0 -> 176 bytes .../plugins/magicline/images/hidpi/icon.png | Bin 260 -> 199 bytes .../plugins/magicline/images/icon-rtl.png | Bin 0 -> 138 bytes .../plugins/magicline/images/icon.png | Bin 172 -> 133 bytes .../plugins/pagebreak/images/pagebreak.gif | Bin 54 -> 99 bytes .../plugins/pastefromword/filter/default.js | 57 +- .../ckeditor/plugins/preview/preview.html | 13 +- .../ckeditor/plugins/scayt/CHANGELOG.md | 20 + .../ckeditor/ckeditor/plugins/scayt/README.md | 2 +- .../ckeditor/plugins/scayt/dialogs/options.js | 39 +- .../showblocks/images/block_address.png | Bin 171 -> 152 bytes .../showblocks/images/block_blockquote.png | Bin 181 -> 154 bytes .../plugins/showblocks/images/block_div.png | Bin 136 -> 127 bytes .../plugins/showblocks/images/block_h1.png | Bin 127 -> 120 bytes .../plugins/showblocks/images/block_h2.png | Bin 134 -> 127 bytes .../plugins/showblocks/images/block_h3.png | Bin 131 -> 123 bytes .../plugins/showblocks/images/block_h4.png | Bin 133 -> 123 bytes .../plugins/showblocks/images/block_h5.png | Bin 133 -> 126 bytes .../plugins/showblocks/images/block_h6.png | Bin 129 -> 123 bytes .../plugins/showblocks/images/block_p.png | Bin 119 -> 115 bytes .../plugins/showblocks/images/block_pre.png | Bin 136 -> 128 bytes .../ckeditor/plugins/smiley/dialogs/smiley.js | 15 +- .../plugins/smiley/images/angel_smile.gif | Bin 1250 -> 1245 bytes .../plugins/smiley/images/angel_smile.png | Bin 1294 -> 1172 bytes .../plugins/smiley/images/angry_smile.gif | Bin 1221 -> 1219 bytes .../plugins/smiley/images/angry_smile.png | Bin 1351 -> 1220 bytes .../plugins/smiley/images/broken_heart.gif | Bin 1131 -> 732 bytes .../plugins/smiley/images/broken_heart.png | Bin 1213 -> 1139 bytes .../plugins/smiley/images/confused_smile.gif | Bin 1210 -> 1202 bytes .../plugins/smiley/images/confused_smile.png | Bin 1175 -> 1101 bytes .../plugins/smiley/images/cry_smile.png | Bin 1315 -> 1214 bytes .../plugins/smiley/images/devil_smile.png | Bin 1299 -> 1220 bytes .../smiley/images/embaressed_smile.gif | Bin 790 -> 786 bytes .../smiley/images/embarrassed_smile.gif | Bin 790 -> 786 bytes .../smiley/images/embarrassed_smile.png | Bin 1222 -> 1145 bytes .../plugins/smiley/images/envelope.gif | Bin 712 -> 506 bytes .../plugins/smiley/images/envelope.png | Bin 1049 -> 760 bytes .../ckeditor/plugins/smiley/images/heart.gif | Bin 1091 -> 692 bytes .../ckeditor/plugins/smiley/images/heart.png | Bin 1073 -> 999 bytes .../ckeditor/plugins/smiley/images/kiss.gif | Bin 1082 -> 683 bytes .../ckeditor/plugins/smiley/images/kiss.png | Bin 1077 -> 1003 bytes .../plugins/smiley/images/lightbulb.gif | Bin 1062 -> 660 bytes .../plugins/smiley/images/lightbulb.png | Bin 993 -> 919 bytes .../plugins/smiley/images/omg_smile.gif | Bin 1207 -> 820 bytes .../plugins/smiley/images/omg_smile.png | Bin 1196 -> 1122 bytes .../plugins/smiley/images/regular_smile.gif | Bin 1216 -> 1209 bytes .../plugins/smiley/images/regular_smile.png | Bin 1158 -> 1084 bytes .../plugins/smiley/images/sad_smile.gif | Bin 1199 -> 782 bytes .../plugins/smiley/images/sad_smile.png | Bin 1189 -> 1115 bytes .../plugins/smiley/images/shades_smile.gif | Bin 1234 -> 1231 bytes .../plugins/smiley/images/shades_smile.png | Bin 1353 -> 1204 bytes .../plugins/smiley/images/teeth_smile.gif | Bin 1210 -> 1201 bytes .../plugins/smiley/images/teeth_smile.png | Bin 1257 -> 1183 bytes .../plugins/smiley/images/thumbs_down.gif | Bin 1117 -> 715 bytes .../plugins/smiley/images/thumbs_down.png | Bin 1059 -> 985 bytes .../plugins/smiley/images/thumbs_up.gif | Bin 1112 -> 714 bytes .../plugins/smiley/images/thumbs_up.png | Bin 1033 -> 959 bytes .../plugins/smiley/images/tongue_smile.gif | Bin 1216 -> 1210 bytes .../plugins/smiley/images/tongue_smile.png | Bin 1206 -> 1132 bytes .../plugins/smiley/images/tounge_smile.gif | Bin 1216 -> 1210 bytes .../images/whatchutalkingabout_smile.gif | Bin 1190 -> 775 bytes .../images/whatchutalkingabout_smile.png | Bin 1113 -> 1039 bytes .../plugins/smiley/images/wink_smile.gif | Bin 1214 -> 1202 bytes .../plugins/smiley/images/wink_smile.png | Bin 1188 -> 1114 bytes .../dialogs/lang/_translationstatus.txt | 2 +- .../plugins/specialchar/dialogs/lang/af.js | 13 + .../plugins/specialchar/dialogs/lang/ar.js | 4 +- .../plugins/specialchar/dialogs/lang/bg.js | 2 +- .../plugins/specialchar/dialogs/lang/ca.js | 2 +- .../plugins/specialchar/dialogs/lang/cs.js | 2 +- .../plugins/specialchar/dialogs/lang/cy.js | 2 +- .../plugins/specialchar/dialogs/lang/da.js | 11 + .../plugins/specialchar/dialogs/lang/de.js | 20 +- .../plugins/specialchar/dialogs/lang/el.js | 8 +- .../plugins/specialchar/dialogs/lang/en-gb.js | 2 +- .../plugins/specialchar/dialogs/lang/en.js | 2 +- .../plugins/specialchar/dialogs/lang/eo.js | 2 +- .../plugins/specialchar/dialogs/lang/es.js | 2 +- .../plugins/specialchar/dialogs/lang/et.js | 2 +- .../plugins/specialchar/dialogs/lang/eu.js | 13 + .../plugins/specialchar/dialogs/lang/fa.js | 2 +- .../plugins/specialchar/dialogs/lang/fi.js | 2 +- .../plugins/specialchar/dialogs/lang/fr-ca.js | 2 +- .../plugins/specialchar/dialogs/lang/fr.js | 4 +- .../plugins/specialchar/dialogs/lang/gl.js | 2 +- .../plugins/specialchar/dialogs/lang/he.js | 2 +- .../plugins/specialchar/dialogs/lang/hr.js | 4 +- .../plugins/specialchar/dialogs/lang/hu.js | 2 +- .../plugins/specialchar/dialogs/lang/id.js | 2 +- .../plugins/specialchar/dialogs/lang/it.js | 2 +- .../plugins/specialchar/dialogs/lang/ja.js | 2 +- .../plugins/specialchar/dialogs/lang/km.js | 2 +- .../plugins/specialchar/dialogs/lang/ko.js | 10 + .../plugins/specialchar/dialogs/lang/ku.js | 2 +- .../plugins/specialchar/dialogs/lang/lt.js | 13 + .../plugins/specialchar/dialogs/lang/lv.js | 2 +- .../plugins/specialchar/dialogs/lang/nb.js | 2 +- .../plugins/specialchar/dialogs/lang/nl.js | 2 +- .../plugins/specialchar/dialogs/lang/no.js | 2 +- .../plugins/specialchar/dialogs/lang/pl.js | 4 +- .../plugins/specialchar/dialogs/lang/pt-br.js | 2 +- .../plugins/specialchar/dialogs/lang/pt.js | 12 +- .../plugins/specialchar/dialogs/lang/ru.js | 2 +- .../plugins/specialchar/dialogs/lang/si.js | 2 +- .../plugins/specialchar/dialogs/lang/sk.js | 2 +- .../plugins/specialchar/dialogs/lang/sl.js | 2 +- .../plugins/specialchar/dialogs/lang/sq.js | 2 +- .../plugins/specialchar/dialogs/lang/sv.js | 2 +- .../plugins/specialchar/dialogs/lang/th.js | 2 +- .../plugins/specialchar/dialogs/lang/tr.js | 2 +- .../plugins/specialchar/dialogs/lang/tt.js | 13 + .../plugins/specialchar/dialogs/lang/ug.js | 2 +- .../plugins/specialchar/dialogs/lang/uk.js | 2 +- .../plugins/specialchar/dialogs/lang/vi.js | 2 +- .../plugins/specialchar/dialogs/lang/zh-cn.js | 2 +- .../plugins/specialchar/dialogs/lang/zh.js | 15 +- .../specialchar/dialogs/specialchar.js | 20 +- .../ckeditor/plugins/table/dialogs/table.js | 34 +- .../plugins/tabletools/dialogs/tableCell.js | 24 +- .../plugins/templates/dialogs/templates.css | 12 +- .../plugins/templates/dialogs/templates.js | 14 +- .../plugins/templates/templates/default.js | 7 +- .../ckeditor/plugins/wsc/dialogs/ciframe.html | 2 +- .../ckeditor/plugins/wsc/dialogs/tmp.html | 118 - .../plugins/wsc/dialogs/tmpFrameset.html | 2 +- .../ckeditor/plugins/wsc/dialogs/wsc.css | 2 +- .../ckeditor/plugins/wsc/dialogs/wsc.js | 153 +- .../ckeditor/plugins/wsc/dialogs/wsc_ie.js | 14 +- .../samples/assets/inlineall/logo.png | Bin 4411 -> 0 bytes .../ckeditor/samples/assets/sample.css | 3 - .../ckeditor/samples/assets/sample.jpg | Bin 17932 -> 0 bytes .../ckeditor/ckeditor/samples/css/samples.css | 1640 ++++++++++++++ .../ckeditor/samples/img/github-top.png | Bin 0 -> 383 bytes .../ckeditor/samples/img/header-bg.png | Bin 0 -> 13086 bytes .../ckeditor/samples/img/header-separator.png | Bin 0 -> 123 bytes .../ckeditor/ckeditor/samples/img/logo.png | Bin 0 -> 5891 bytes .../ckeditor/samples/img/navigation-tip.png | Bin 0 -> 12029 bytes .../ckeditor/ckeditor/samples/index.html | 218 +- .../ckeditor/ckeditor/samples/js/sample.js | 53 + .../ckeditor/ckeditor/samples/js/sf.js | 17 + .../ckeditor/samples/{ => old}/ajax.html | 9 +- .../ckeditor/samples/{ => old}/api.html | 9 +- .../ckeditor/samples/{ => old}/appendto.html | 22 +- .../samples/old/assets/inlineall/logo.png | Bin 0 -> 4283 bytes .../assets/outputxhtml/outputxhtml.css | 2 +- .../samples/{ => old}/assets/posteddata.php | 4 +- .../ckeditor/samples/old/assets/sample.jpg | Bin 0 -> 14449 bytes .../{ => old}/assets/uilanguages/languages.js | 6 +- .../samples/{ => old}/datafiltering.html | 115 +- .../dialog/assets/my_dialog.js | 4 +- .../{plugins => old}/dialog/dialog.html | 11 +- .../samples/{ => old}/divreplace.html | 9 +- .../{plugins => old}/enterkey/enterkey.html | 11 +- .../assets/outputforflash/outputforflash.fla | Bin .../assets/outputforflash/outputforflash.swf | Bin .../assets/outputforflash/swfobject.js | 19 + .../htmlwriter/outputforflash.html | 13 +- .../htmlwriter/outputhtml.html | 13 +- .../ckeditor/ckeditor/samples/old/index.html | 131 ++ .../ckeditor/samples/{ => old}/inlineall.html | 9 +- .../samples/{ => old}/inlinebycode.html | 9 +- .../samples/{ => old}/inlinetextarea.html | 11 +- .../ckeditor/samples/{ => old}/jquery.html | 15 +- .../{plugins => old}/magicline/magicline.html | 11 +- .../ckeditor/samples/{ => old}/readonly.html | 9 +- .../samples/{ => old}/replacebyclass.html | 9 +- .../samples/{ => old}/replacebycode.html | 9 +- .../ckeditor/samples/{ => old}/sample.css | 55 +- .../ckeditor/samples/{ => old}/sample.js | 2 +- .../samples/{ => old}/sample_posteddata.php | 4 +- .../ckeditor/samples/{ => old}/tabindex.html | 9 +- .../{plugins => old}/toolbar/toolbar.html | 11 +- .../ckeditor/samples/{ => old}/uicolor.html | 9 +- .../samples/{ => old}/uilanguages.html | 9 +- .../samples/old/wysiwygarea/fullpage.html | 80 + .../samples/{ => old}/xhtmlstyle.html | 11 +- .../assets/outputforflash/swfobject.js | 18 - .../samples/plugins/wysiwygarea/fullpage.html | 77 - .../toolbarconfigurator/css/fontello.css | 55 + .../toolbarconfigurator/font/LICENSE.txt | 10 + .../toolbarconfigurator/font/config.json | 28 + .../toolbarconfigurator/font/fontello.eot | Bin 0 -> 4988 bytes .../toolbarconfigurator/font/fontello.svg | 14 + .../toolbarconfigurator/font/fontello.ttf | Bin 0 -> 4820 bytes .../toolbarconfigurator/font/fontello.woff | Bin 0 -> 2904 bytes .../samples/toolbarconfigurator/index.html | 446 ++++ .../js/abstracttoolbarmodifier.js | 13 + .../js/fulltoolbareditor.js | 9 + .../toolbarconfigurator/js/toolbarmodifier.js | 33 + .../js/toolbartextmodifier.js | 14 + .../lib/codemirror/LICENSE | 19 + .../lib/codemirror/codemirror.css | 325 +++ .../lib/codemirror/codemirror.js | 288 +++ .../lib/codemirror/javascript.js | 25 + .../lib/codemirror/neo.css | 36 + .../lib/codemirror/show-hint.css | 38 + .../lib/codemirror/show-hint.js | 16 + .../ckeditor/ckeditor/skins/moono/dialog.css | 4 +- .../ckeditor/skins/moono/dialog_ie.css | 4 +- .../ckeditor/skins/moono/dialog_ie7.css | 4 +- .../ckeditor/skins/moono/dialog_ie8.css | 4 +- .../ckeditor/skins/moono/dialog_iequirks.css | 4 +- .../ckeditor/skins/moono/dialog_opera.css | 5 - .../ckeditor/ckeditor/skins/moono/editor.css | 4 +- .../ckeditor/skins/moono/editor_gecko.css | 4 +- .../ckeditor/skins/moono/editor_ie.css | 4 +- .../ckeditor/skins/moono/editor_ie7.css | 4 +- .../ckeditor/skins/moono/editor_ie8.css | 4 +- .../ckeditor/skins/moono/editor_iequirks.css | 4 +- .../ckeditor/ckeditor/skins/moono/icons.png | Bin 20643 -> 20634 bytes .../ckeditor/skins/moono/images/arrow.png | Bin 261 -> 191 bytes .../ckeditor/skins/moono/images/close.png | Bin 824 -> 468 bytes .../skins/moono/images/hidpi/close.png | Bin 1792 -> 1271 bytes .../skins/moono/images/hidpi/lock-open.png | Bin 1503 -> 1329 bytes .../skins/moono/images/hidpi/lock.png | Bin 1616 -> 1299 bytes .../skins/moono/images/hidpi/refresh.png | Bin 2320 -> 1842 bytes .../ckeditor/skins/moono/images/lock-open.png | Bin 736 -> 349 bytes .../ckeditor/skins/moono/images/lock.png | Bin 728 -> 475 bytes .../ckeditor/skins/moono/images/refresh.png | Bin 953 -> 422 bytes .../ckeditor/skins/moono/images/spinner.gif | Bin 0 -> 2984 bytes .../ckeditor/ckeditor/skins/moono/readme.md | 6 +- htdocs/includes/ckeditor/ckeditor/styles.js | 2 +- 387 files changed, 7830 insertions(+), 2428 deletions(-) create mode 100644 htdocs/includes/ckeditor/ckeditor/lang/tt.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js delete mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/fakeobjects/images/spacer.gif create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/magicline/images/icon-rtl.png create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js create mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js delete mode 100644 htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmp.html delete mode 100644 htdocs/includes/ckeditor/ckeditor/samples/assets/inlineall/logo.png delete mode 100644 htdocs/includes/ckeditor/ckeditor/samples/assets/sample.css delete mode 100644 htdocs/includes/ckeditor/ckeditor/samples/assets/sample.jpg create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/css/samples.css create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/img/github-top.png create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/img/header-bg.png create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/img/header-separator.png create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/img/logo.png create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/img/navigation-tip.png create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/js/sample.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/js/sf.js rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/ajax.html (86%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/api.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/appendto.html (55%) create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/old/assets/inlineall/logo.png rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/assets/outputxhtml/outputxhtml.css (96%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/assets/posteddata.php (90%) create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/old/assets/sample.jpg rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/assets/uilanguages/languages.js (77%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/datafiltering.html (72%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/dialog/assets/my_dialog.js (85%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/dialog/dialog.html (93%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/divreplace.html (92%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/enterkey/enterkey.html (88%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/htmlwriter/assets/outputforflash/outputforflash.fla (100%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/htmlwriter/assets/outputforflash/outputforflash.swf (100%) create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/htmlwriter/outputforflash.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/htmlwriter/outputhtml.html (92%) create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/old/index.html rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/inlineall.html (96%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/inlinebycode.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/inlinetextarea.html (92%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/jquery.html (92%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/magicline/magicline.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/readonly.html (87%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/replacebyclass.html (95%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/replacebycode.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/sample.css (86%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/sample.js (96%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/sample_posteddata.php (79%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/tabindex.html (84%) rename htdocs/includes/ckeditor/ckeditor/samples/{plugins => old}/toolbar/toolbar.html (94%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/uicolor.html (85%) rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/uilanguages.html (91%) create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/old/wysiwygarea/fullpage.html rename htdocs/includes/ckeditor/ckeditor/samples/{ => old}/xhtmlstyle.html (94%) delete mode 100644 htdocs/includes/ckeditor/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js delete mode 100644 htdocs/includes/ckeditor/ckeditor/samples/plugins/wysiwygarea/fullpage.html create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/css/fontello.css create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/config.json create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.eot create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.svg create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.ttf create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/font/fontello.woff create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/index.html create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css create mode 100644 htdocs/includes/ckeditor/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js delete mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/dialog_opera.css create mode 100644 htdocs/includes/ckeditor/ckeditor/skins/moono/images/spinner.gif diff --git a/COPYRIGHT b/COPYRIGHT index 191639ed001..6c2dab9444a 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -14,7 +14,7 @@ Component Version License GPL Compatible PHP libraries: AdoDb-Date 0.36 Modified BSD License Yes Date convertion (not into rpm package) ChromePHP 4.1.0 Apache Software License 2.0 Yes Return server log to chrome browser console -CKEditor 4.3.3 LGPL-2.1+ Yes Editor WYSIWYG +CKEditor 4.5.6 LGPL-2.1+ Yes Editor WYSIWYG EvalMath 1.0 BSD Yes Safe math expressions evaluation Escpos-php MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers FPDI 1.5.2 Apache Software License 2.0 Yes PDF templates management diff --git a/composer.json b/composer.json index 7713badd313..f4ea5de0c73 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "php": ">=5.3.0", "ext-curl": "*", "ccampbell/chromephp": "^4.1", - "ckeditor/ckeditor": "dev-full/4.3.x#0b7c3f1", + "ckeditor/ckeditor": "dev-full/stable", "mike42/escpos-php": "dev-master", "mobiledetect/mobiledetectlib": "2.8.17", "phpoffice/phpexcel": "1.8.1", diff --git a/composer.lock b/composer.lock index da19c20fbc5..2ccd1f616a5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d8229cbb9aea945c9ca803bbe54d7aa7", - "content-hash": "47929ed42fb67e5159ccec6a3a5a45eb", + "hash": "4a06567f53c5f081f9c961a0b3093da3", + "content-hash": "265061f1a1056df2e8c5184841993d0f", "packages": [ { "name": "ccampbell/chromephp", @@ -52,16 +52,16 @@ }, { "name": "ckeditor/ckeditor", - "version": "dev-full/4.3.x", + "version": "dev-full/stable", "source": { "type": "git", "url": "https://github.com/ckeditor/ckeditor-releases.git", - "reference": "0b7c3f1" + "reference": "c1cefe7341e6910a1e6cb2f3f024bbdaf6cd1d4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/252e512e911f21d880ea542fe162c4643885b317", - "reference": "0b7c3f1", + "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/c1cefe7341e6910a1e6cb2f3f024bbdaf6cd1d4d", + "reference": "c1cefe7341e6910a1e6cb2f3f024bbdaf6cd1d4d", "shasum": "" }, "type": "library", @@ -89,7 +89,7 @@ "text", "wysiwyg" ], - "time": "2014-02-26 15:43:10" + "time": "2015-12-09 15:49:34" }, { "name": "mike42/escpos-php", @@ -398,7 +398,1119 @@ "time": "2015-09-12 10:08:34" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, + { + "name": "myclabs/deep-copy", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e3abefcd7f106677fd352cd7c187d6c969aa9ddc", + "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2015-11-07 22:20:37" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "phpDocumentor": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "time": "2015-02-03 12:10:50" + }, + { + "name": "phpspec/prophecy", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1" + }, + "require-dev": { + "phpspec/phpspec": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2015-08-13 10:07:40" + }, + { + "name": "phpunit/php-code-coverage", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "f7bb5cddf4ffe113eeb737b05241adb947b43f9d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7bb5cddf4ffe113eeb737b05241adb947b43f9d", + "reference": "f7bb5cddf4ffe113eeb737b05241adb947b43f9d", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" + }, + "require-dev": { + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~5" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2015-11-12 21:08:20" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2015-06-21 13:08:43" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21 13:50:34" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2015-06-21 08:01:12" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2015-09-15 10:49:45" + }, + { + "name": "phpunit/phpunit", + "version": "5.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "c047ff05d2279404af9a7e89e2a7151c32c88022" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c047ff05d2279404af9a7e89e2a7151c32c88022", + "reference": "c047ff05d2279404af9a7e89e2a7151c32c88022", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "myclabs/deep-copy": "~1.3", + "php": ">=5.6", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~3.0", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": ">=1.0.6", + "phpunit/phpunit-mock-objects": ">=3.0.5", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2015-12-10 07:54:54" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/49bc700750196c04dd6bc2c4c99cb632b893836b", + "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": ">=5.6", + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2015-12-08 08:47:06" + }, + { + "name": "sebastian/comparator", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2015-07-26 15:48:44" + }, + { + "name": "sebastian/diff", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-12-08 07:14:41" + }, + { + "name": "sebastian/environment", + "version": "1.3.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "6e7133793a8e5a5714a551a8324337374be209df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df", + "reference": "6e7133793a8e5a5714a551a8324337374be209df", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2015-12-02 08:37:27" + }, + { + "name": "sebastian/exporter", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2015-06-21 07:55:53" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" + }, + { + "name": "sebastian/recursion-context", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2015-11-11 19:50:13" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28 20:34:47" + }, + { + "name": "sebastian/version", + "version": "1.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2015-06-21 13:59:46" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.4.0", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "32a879f4f35019d78d568db2885d7779ca084a33" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/32a879f4f35019d78d568db2885d7779ca084a33", + "reference": "32a879f4f35019d78d568db2885d7779ca084a33", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2015-11-23 21:30:59" + }, + { + "name": "symfony/yaml", + "version": "v3.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2015-11-30 12:36:17" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": { diff --git a/htdocs/includes/ckeditor/ckeditor/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/CHANGES.md index a5bec2ba830..ff1cb9fdfa6 100644 --- a/htdocs/includes/ckeditor/ckeditor/CHANGES.md +++ b/htdocs/includes/ckeditor/ckeditor/CHANGES.md @@ -1,11 +1,606 @@ CKEditor 4 Changelog ==================== +## CKEditor 4.5.6 + +New Features: + +* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies. +* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication. + +Other Changes: + +* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type): + - New features: + - CKEditor [Language](http://ckeditor.com/addon/language) plugin support. + - CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support. + - [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support. + - **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality. + - Fixed issues: + * [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core. + * [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements. + * [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting. + * [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page. + * [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content. + * [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe. + * SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled. + * Issue with pasting SCAYT markup in CKEditor. + * SCAYT stops working after pressing the *Cancel* button in the WSC dialog. + +## CKEditor 4.5.5 + +Fixed Issues: + +* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)! +* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: The [Link](http://ckeditor.com/addon/link) plugin dialog does not display the subject of email links if the subject parameter is not lowercase. +* [#9192](http://dev.ckeditor.com/ticket/9192): Fixed: An `undefined` string is appended to an email address added with the [Link](http://ckeditor.com/addon/link) plugin if subject and email body are empty and [`config.emailProtection`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-emailProtection) is set to `encode`. +* [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: It is not possible to destroy the editor `');return b.join("")})}},fileButton:function(b,a,d){if(!(3>arguments.length)){i.call(this,a);var e=this;a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),f=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d= -a["for"];if(!f||f.call(this,c)!==false){b.getContentElement(d[0],d[1]).submit();this.disable()}};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(e)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,d=/\/$/;return function(e,c,f){if(!(3>arguments.length)){var h=[],g=c.html;"<"!=g.charAt(0)&&(g=""+g+"");var k=c.focus;if(k){var j=this.focus;this.focus=function(){("function"== -typeof k?k:j).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,e,c,h,"span",null,null,"");h=h.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);f.push([g[1]," ",h[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,e,c){var f=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,e,"fieldset",null,null,function(){var a=[];f&&a.push(""+f+"");for(var b=0;ba.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=b;return this},getLabel:function(){var b= -CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:o},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return!this._.disabled?this.fire("click",{dialog:this._.dialog}):!1},enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()}, +return function(g,e){var a=g.uiColor,a={id:"."+g.id,defaultBorder:b(a,-.1),defaultGradient:c(b(a,.9),a),lightGradient:c(b(a,1),b(a,.7)),mediumGradient:c(b(a,.8),b(a,.5)),ckeButtonOn:c(b(a,.6),b(a,.7)),ckeResizer:b(a,-.4),ckeToolbarSeparator:b(a,.5),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTabSelected:c("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),elementsPathBg:a,menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[e].output(a).replace(/\[/g,"{").replace(/\]/g, +"}")}}();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;darguments.length)){var c=h.call(this,a);c.labelId=CKEDITOR.tools.getNextId()+ +"_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"', +a.controlStyle?' style\x3d"'+a.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,a),"\x3c/div\x3e"):(g={type:"hbox",widths:a.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" id\x3d"'+c.labelId+'" for\x3d"'+c.inputId+'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(a.controlStyle?' style\x3d"'+a.controlStyle+ +'"':"")+"\x3e"+f.call(this,b,a)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,g,e));return e.join("")})}},textInput:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",c={"class":"cke_dialog_ui_input_"+a.type,id:f,type:a.type};a.validate&&(this.validate=a.validate);a.maxLength&&(c.maxlength=a.maxLength);a.size&&(c.size=a.size);a.inputStyle&&(c.style=a.inputStyle);var e=this,m=!1;b.on("load",function(){e.getInputElement().on("keydown", +function(a){13==a.data.getKeystroke()&&(m=!0)});e.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&m&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),m=!1);e.bidi&&w.call(e,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var b=['\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"'];a.width&&b.push('style\x3d"width:'+a.width+'" ');b.push("\x3e\x3cinput ");c["aria-labelledby"]=this._.labelId;this._.required&& +(c["aria-required"]=this._.required);for(var e in c)b.push(e+'\x3d"'+c[e]+'" ');b.push(" /\x3e\x3c/div\x3e");return b.join("")})}},textarea:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this,c=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",e={};a.validate&&(this.validate=a.validate);e.rows=a.rows||5;e.cols=a.cols||20;e["class"]="cke_dialog_ui_input_textarea "+(a["class"]||"");"undefined"!=typeof a.inputStyle&&(e.style=a.inputStyle);a.dir&&(e.dir=a.dir);if(f.bidi)b.on("load", +function(){f.getInputElement().on("keyup",w)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){e["aria-labelledby"]=this._.labelId;this._.required&&(e["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',c,'" '],b;for(b in e)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(e[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b, +a,d){if(!(3>arguments.length)){var f=h.call(this,a,{"default":!!a["default"]});a.validate&&(this.validate=a.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"span",null,null,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),e=[],d=CKEDITOR.tools.getNextId()+"_label",g={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":d};t(c);a["default"]&&(g.checked="checked");"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle); +f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,c,e,"input",null,g);e.push(' \x3clabel id\x3d"',d,'" for\x3d"',g.id,'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(a.label),"\x3c/label\x3e");return e.join("")})}},radio:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);this._["default"]||(this._["default"]=this._.initValue=a.items[0][1]);a.validate&&(this.validate=a.validate);var f=[],c=this;a.role="radiogroup";a.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this, +b,a,d,function(){for(var e=[],d=[],g=(a.id?a.id:CKEDITOR.tools.getNextId())+"_radio",k=0;karguments.length)){var f=h.call(this,a);a.validate&&(this.validate=a.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),e=[],d=[],g={id:f.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};e.push('\x3cdiv class\x3d"cke_dialog_ui_input_', +a.type,'" role\x3d"presentation"');a.width&&e.push('style\x3d"width:'+a.width+'" ');e.push("\x3e");void 0!==a.size&&(g.size=a.size);void 0!==a.multiple&&(g.multiple=a.multiple);t(c);for(var k=0,l;karguments.length)){void 0===a["default"]&&(a["default"]="");var f=CKEDITOR.tools.extend(h.call(this,a),{definition:a,buttons:[]});a.validate&&(this.validate=a.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var b=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"', +f.frameId,'" title\x3d"',a.label,'" src\x3d"javascript:void('];b.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");b.push(')"\x3e\x3c/iframe\x3e');return b.join("")})}},fileButton:function(b,a,d){var f=this;if(!(3>arguments.length)){h.call(this,a);a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),e=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d= +a["for"];e&&!1===e.call(this,c)||(b.getContentElement(d[0],d[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,d=/\/$/;return function(f,c,e){if(!(3>arguments.length)){var m=[],g=c.html;"\x3c"!=g.charAt(0)&&(g="\x3cspan\x3e"+g+"\x3c/span\x3e");var k=c.focus;if(k){var l=this.focus;this.focus=function(){("function"== +typeof k?k:l).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,c,m,"span",null,null,"");m=m.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);e.push([g[1]," ",m[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,f,c){var e=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,f,"fieldset",null,null,function(){var a=[];e&&a.push("\x3clegend"+ +(c.labelStyle?' style\x3d"'+c.labelStyle+'"':"")+"\x3e"+e+"\x3c/legend\x3e");for(var b=0;ba.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=b;return this},getLabel:function(){var b= +CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:r},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()}, isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(b,a){this.on("click",function(){a.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)}, -focus:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&a.$.focus()},0)},select:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&(a.$.focus(),a.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(b){!b&&(b="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},keyboardFocusable:!0},n,!0);CKEDITOR.ui.dialog.textarea.prototype=new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype= -CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(b,a,d){var e=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),c=this.getInputElement().$;e.$.text=b;e.$.value=void 0===a||null===a?b:a;void 0===d||null===d?CKEDITOR.env.ie?c.add(e.$):c.add(e.$,null):c.add(e.$,d);return this},remove:function(b){this.getInputElement().$.remove(b);return this},clear:function(){for(var b=this.getInputElement().$;0< -b.length;)b.remove(0);return this},keyboardFocusable:!0},n,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(b,a){this.getInputElement().$.checked=b;!a&&this.fire("change",{value:b})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8','
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md new file mode 100644 index 00000000000..27822a7330e --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md @@ -0,0 +1,20 @@ +SCAYT plugin for CKEditor 4 Changelog +==================== +### CKEditor 4.5.6 + +New Features: +* CKEditor [language adddon](http://ckeditor.com/addon/language) support +* CKEditor [placeholder adddon](http://ckeditor.com/addon/placeholder) support +* Drag and Drop support +* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25 + +Fixed issues: +* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core. +* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements +* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting +* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page +* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content +* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe +* SCAYT stops working when CKEditor Undo plug-in not enabled +* Issue with pasting SCAYT markup in CKEditor +* SCAYT stops working after pressing Cancel button in WSC dialog diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md index 3b1ad94cb57..1b3de25d38a 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md +++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md @@ -1,7 +1,7 @@ CKEditor SCAYT Plugin ===================== -This plugin brings Spell Check As You Type (SCAYT) into CKEditor. +This plugin brings Spell Check As You Type (SCAYT) into up to CKEditor 4+. SCAYT is a "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution. diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js index cc97b33a78f..12dbfd132d0 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/dialogs/options.js @@ -1,20 +1,19 @@ -/* - Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. - For licensing, see LICENSE.html or http://ckeditor.com/license -*/ -CKEDITOR.dialog.add("scaytcheck",function(j){function w(){return"undefined"!=typeof document.forms["optionsbar_"+b]?document.forms["optionsbar_"+b].options:[]}function x(a,b){if(a){var e=a.length;if(void 0==e)a.checked=a.value==b.toString();else for(var d=0;d'+a+"")}function o(a){f.getById("dic_message_"+b).setHtml(''+a+"")} -function p(a){for(var a=(""+a).split(","),b=0,e=a.length;b
\t
\t
\t\t\t\t\t
\t
\t\t\t\t\t
\t
\t\t\t\t
\t
\t\t\t\t\t
'}]},{id:"langs",label:g.languagesTab,elements:[{type:"html",id:"langs", -html:'
\t
\t
'}]},{id:"dictionaries",label:g.dictionariesTab,elements:[{type:"html",style:"",id:"dictionaries",html:'
\t
\t
Dictionary name
\t\t\t\t\t
\t\t\t\t\t\t
\t\t
\t\t\t\t\t\t\t\t\t\t\t\t\t\t
\t
'}]},{id:"about", -label:g.aboutTab,elements:[{type:"html",id:"about",style:"margin: 5px 5px;",html:'
'}]}],B={title:g.title,minWidth:360,minHeight:220,onShow:function(){var a=this;a.data=j.fire("scaytDialog",{});a.options=a.data.scayt_control.option();a.chosed_lang=a.sLang=a.data.scayt_control.sLang;if(!a.data||!a.data.scayt||!a.data.scayt_control)alert("Error loading application service"),a.hide();else{var b=0;s?a.data.scayt.getCaption(j.langCode||"en",function(e){0'+h["button_"+d[c]]+"");f.getById("dic_info_"+ -b).setHtml(h.dic_info)}if(1==l[0])for(c in v)d="label_"+v[c],g=f.getById(d+"_"+b),"undefined"!=typeof g&&("undefined"!=typeof h[d]&&"undefined"!=typeof k.options[v[c]])&&(g.setHtml(h[d]),g.getParent().$.style.display="block");d='

'+h.version+window.scayt.getAboutInfo().version.toString()+"

"+h.about_throwt_copy+"

";f.getById("scayt_about_"+b).setHtml(d);d=function(a,b){var c=f.createElement("label");c.setAttribute("for","cke_option"+ -a);c.setStyle("display","inline");c.setHtml(b[a]);k.sLang==a&&(k.chosed_lang=a);var d=f.createElement("div"),e=CKEDITOR.dom.element.createFromHtml('');e.on("click",function(){this.$.checked=true;k.chosed_lang=a});d.append(e);d.append(c);return{lang:b[a],code:a,radio:d}};if(1==l[1]){for(c in e.rtl)i[i.length]=d(c,e.ltr);for(c in e.ltr)i[i.length]=d(c, -e.ltr);i.sort(function(a,b){return b.lang>a.lang?-1:1});e=f.getById("scayt_lcol_"+b);d=f.getById("scayt_rcol_"+b);for(c=0;cb[1]?c=1:a[1]*Q@*YJ}`VYyLAsJ_npt$*%DnlHVOc|aZSoZ0&v9u0000< KMNUMnLSTYxEh;|% delta 123 zcmV->0EGXT0jmL!7zqdi0001}V%@8eAtPr}NklYp_5%0dn$b+so}w|rB(JUk{W9%d1w;77ISNQ^gv+^& dtDb)qegM0h$4j7zqIb0001w!cKLOAtP2nNkl@lFc}~B6zAmjI3Hm6 zwtH>#+Oqo~#(HZo<0F`H94rEpf~xu0Q=C)WcNlEWKe&PR*sXvu05u+AfRCThHUIzs M07*qoM6N<$f_jxI*8l(j delta 133 zcmV;00DAwL0kr{;7zqdi0001j(kuj#AtP~INkl-#G6@G(% iW!xHd;tSb0nHi?f)sUH<%x4GG$>8bg=d#Wzp$P!N(ipM; delta 87 zcmb>LV4NVq$-&IPz+lr-5;;*(*+t*e#W6%8JUQVAn}mmGYC-~ovE&1$fF{P(8WB9Z qHA0#uXl%Nek=I~7B_%#Ug^OY1dPWJ0z*Hlk5e%NLelF{r5}E)nei?57 diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h1.png index 3a64347350e5a48d2702f2fc4d436dfb5524b3a8..3933325c08f3f4eacec46c97600f7cba01ead54f 100644 GIT binary patch delta 70 zcmb=gm>|K)$jrdNU{Sv2!v%s&z)f)0G{mNGq a5*a+wRMIS5|E&XRVeoYIb6Mw<&;$T(@ELmm delta 77 zcmb=ZpCG}>!OXzGV48nLd7`4SwVJ1kV~E7%mvbCD0i(?4K_2eJ__ct=O?Vrp3=&i$_y^Rl<1?sE$ ik9=?3A-j-`lbONtn({mTj3@!1P6kg`KbLh*2~7Y`DI7BZ delta 85 zcmb<#W1Jwt$-&IPz+jqxMR}s4vXic-i(`mHcyfXZJI|3W0|x=-SsctwhdT~3u1t3j pZ@lp0*?~2#Mv{@*TnnagFqHE!JQ24|tp^&w;OXk;vd$@?2>>ry8ZiI> diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h3.png index 5b6a4030284aace8cfa05e67b37966b86355b2aa..cb73d679eb840b9728569b27d8b1933af47aa689 100644 GIT binary patch delta 74 zcmV-Q0JZ;v0eg@b2>}BD0020Dwo;KHBR3*RL_t&t*JJqqzkvaUznur-?Lhp!f#Jh> g2o2_+N2o!<05_H+?!8oPi~s-t07*qoM6N<$f&%Uw^8f$< delta 82 zcmbCxNsW1AcU9%ggi^0>?&t;ucLK6Ul?HM@$ delta 84 zcmbZA!u6{1-oD!M<-l!Q& diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h5.png index e153de09988a289dff08d61d489c3c7338b593c9..ce5bec16cfa84d461672f8b0721911d90a06e445 100644 GIT binary patch delta 77 zcmZo=teYUg$;iyWz+h3oEoh>mvX!c*i(?4K_2eJ__ct=O?cd7$u}%- oNE%vj6koWiFuR#)g(?$6$pnUnJ`Sr+0rfL@y85}Sb4q9e0O>LrP5=M^ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_h6.png index c8d993a9d238e58a8116cc24120c3769f6e239fa..e67b982985ca30ae46dae8049c0f99a35dfc2930 100644 GIT binary patch delta 74 zcmZomvbmC{i(?4K_2eJ__ct=O?Vrp3=&i$^{f!Tu?WgRO eRq9*A*TpFBrfjx#*`;)#E(T9mKbLh*2~7ajq#HT_ delta 80 zcmb jBw~3g-YA_v%i_XNx|rcnK$Pz$pk4+~S3j3^P6xZ%0Sf&p00i_>zopr0JG2)d;kCd delta 69 zcmXRepCG}>!OXzG!0~sh>qJFmV>wS3#}JO_hYTw@R45)*_)78&qol`;+0KUN$MgRZ+ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png b/htdocs/includes/ckeditor/ckeditor/plugins/showblocks/images/block_pre.png index d11a0fffbe66e209b8db4b1ef18ce95960743114..955a8689a13a394a9e715673d23750a6847eb617 100644 GIT binary patch delta 80 zcmV-W0I&au0e}IJ7zqIb0002mqpd5EAtO8|Nkl6 delta 88 zcmZo*>|mTA!O6kQz`$^Q^ZBTWipnnfo-U3d65+`SN4O+B#M2TI90Yhc5(SzBdstd0 s@;V0chWBT2$R$qT+2n1&sN2f8=O3ed@-yehKqDADUHx3vIVCg!07T{)$^ZZW diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js index b202d3ee64f..83abda9414e 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js @@ -1,10 +1,11 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.dialog.add("smiley",function(f){for(var e=f.config,a=f.lang.smiley,h=e.smiley_images,g=e.smiley_columns||8,i,k=function(j){var c=j.data.getTarget(),b=c.getName();if("a"==b)c=c.getChild(0);else if("img"!=b)return;var b=c.getAttribute("cke_src"),a=c.getAttribute("title"),c=f.document.createElement("img",{attributes:{src:b,"data-cke-saved-src":b,title:a,alt:a,width:c.$.width,height:c.$.height}});f.insertElement(c);i.hide();j.data.preventDefault()},n=CKEDITOR.tools.addFunction(function(a,c){var a= -new CKEDITOR.dom.event(a),c=new CKEDITOR.dom.element(c),b;b=a.getKeystroke();var d="rtl"==f.lang.dir;switch(b){case 38:if(b=c.getParent().getParent().getPrevious())b=b.getChild([c.getParent().getIndex(),0]),b.focus();a.preventDefault();break;case 40:if(b=c.getParent().getParent().getNext())(b=b.getChild([c.getParent().getIndex(),0]))&&b.focus();a.preventDefault();break;case 32:k({data:a});a.preventDefault();break;case d?37:39:if(b=c.getParent().getNext())b=b.getChild(0),b.focus(),a.preventDefault(!0); -else if(b=c.getParent().getParent().getNext())(b=b.getChild([0,0]))&&b.focus(),a.preventDefault(!0);break;case d?39:37:if(b=c.getParent().getPrevious())b=b.getChild(0),b.focus(),a.preventDefault(!0);else if(b=c.getParent().getParent().getPrevious())b=b.getLast().getChild(0),b.focus(),a.preventDefault(!0)}}),d=CKEDITOR.tools.getNextId()+"_smiley_emtions_label",d=['
'+a.options+"",'"],l=h.length,a=0;a');var m="cke_smile_label_"+a+"_"+CKEDITOR.tools.getNextNumber();d.push('");a%g==g-1&&d.push("")}if(a");d.push("")}d.push("
"); -e={type:"html",id:"smileySelector",html:d.join(""),onLoad:function(a){i=a.sender},focus:function(){var a=this;setTimeout(function(){a.getElement().getElementsByTag("a").getItem(0).focus()},0)},onClick:k,style:"width: 100%; border-collapse: separate;"};return{title:f.lang.smiley.title,minWidth:270,minHeight:120,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[e]}],buttons:[CKEDITOR.dialog.cancelButton]}}); \ No newline at end of file +CKEDITOR.dialog.add("smiley",function(f){for(var e=f.config,a=f.lang.smiley,h=e.smiley_images,g=e.smiley_columns||8,k,m=function(l){var c=l.data.getTarget(),b=c.getName();if("a"==b)c=c.getChild(0);else if("img"!=b)return;var b=c.getAttribute("cke_src"),a=c.getAttribute("title"),c=f.document.createElement("img",{attributes:{src:b,"data-cke-saved-src":b,title:a,alt:a,width:c.$.width,height:c.$.height}});f.insertElement(c);k.hide();l.data.preventDefault()},q=CKEDITOR.tools.addFunction(function(a,c){a= +new CKEDITOR.dom.event(a);c=new CKEDITOR.dom.element(c);var b;b=a.getKeystroke();var d="rtl"==f.lang.dir;switch(b){case 38:if(b=c.getParent().getParent().getPrevious())b=b.getChild([c.getParent().getIndex(),0]),b.focus();a.preventDefault();break;case 40:(b=c.getParent().getParent().getNext())&&(b=b.getChild([c.getParent().getIndex(),0]))&&b.focus();a.preventDefault();break;case 32:m({data:a});a.preventDefault();break;case d?37:39:if(b=c.getParent().getNext())b=b.getChild(0),b.focus(),a.preventDefault(!0); +else if(b=c.getParent().getParent().getNext())(b=b.getChild([0,0]))&&b.focus(),a.preventDefault(!0);break;case d?39:37:if(b=c.getParent().getPrevious())b=b.getChild(0),b.focus(),a.preventDefault(!0);else if(b=c.getParent().getParent().getPrevious())b=b.getLast().getChild(0),b.focus(),a.preventDefault(!0)}}),d=CKEDITOR.tools.getNextId()+"_smiley_emtions_label",d=['\x3cdiv\x3e\x3cspan id\x3d"'+d+'" class\x3d"cke_voice_label"\x3e'+a.options+"\x3c/span\x3e",'\x3ctable role\x3d"listbox" aria-labelledby\x3d"'+ +d+'" style\x3d"width:100%;height:100%;border-collapse:separate;" cellspacing\x3d"2" cellpadding\x3d"2"',CKEDITOR.env.ie&&CKEDITOR.env.quirks?' style\x3d"position:absolute;"':"","\x3e\x3ctbody\x3e"],n=h.length,a=0;ar7AJq=oeSQy3IC%5|D^-}qX++{ z1^=i8|D_A^tPlUH2>+}L|E~-Gvk(8Y5Aweb;Gz)ZtQY347yqde|EnAQtsUdM663rR z=CT^*v>WHO9Okzj|F;tKz7YSq6aTvv|GpRhwj1}m82`T*|GgdlvLXGlEdR4J|Fksz zyD|T}Hvf}40Si~}zzpxj5c0?r_rxCmz!?9-8vn!_{lgsp#~$>_8UM&0>&Gbf$RYj7 zA^puG|Ia4>&?NuYD*DZ`*M9%uYX9SU|L1-G(14R20!u&r^}hc0#{Bom{rAiK_{shF%m44x z{rb}W`qTdU*Z=X^|MuPf`{4fk;s5#P{`}?t`sn}t?En7r|Ni;^{{55D0z8x80xgr^ z0xgr^0xgr^0xgr^0xgr^0u_HD`2+y~0Ga?S000007XTLkKnVW;H3=L@u%N+#e=<~I z(xgd}00Dpi0T2L23>PvW?eH@YlZ_25R0y%+Ab|h@2pT+Tfnf#>8<_?UY82^Bh%tN8 zc)4;VOdUvgM7)XAh>*ZcB7_tf!c>UUATC_A2+4uNi#Q@;63n!yMg)Hf6);ec5FtX1 zMOq6oV$?_yra)}Ah!C-bO(0A}8!;*f28ozCcL*g~t2fc0J9ES!0W&a@78ge%A6ZhM zfRZAWiA+_&1$#vcQ8279mxrc%WcI1|C_~Y;_Z1gKZ7CGw7~RfkFf~X%A}3 zM7+50gN`U!x|9jiB};#l8VOIN$PuPTIdGKWGpUlGHd%B$y29j$(V>A-^sq%#sE-{r zXwamglgCh_`+B4_&M}3Gksm%lPy!N2kN`ms9jrix966-5h6+q9Az=y-onQh00DvGB z3ul-i+i)TbAz2YcL=lBkP(X2-YA*ni)o@yf2a0LSrXD;x z9KuCnn1Te1m*&`ncpYyt6hvNPKta3(DtN@3V`I+yG=`~C&LN%kz;J|gOne?StS z;1k*MQ3HKcq<9jPiuR0+u%=ecI4+{N+35sYw-b7t(c`kw z>j1UO%bvHE-gsN97LjUKvR8!1u6QCM`*)$=4gKyI*o|lI7~KoaUj2kOCcN;sHzvK8 z`vS=>AMJoI$sc@o`>%Z%@yDP3nD)brAK4g;mc#i%hHwx5Nik@?*&0iOCKJP1l;#p< zz9#3s1#K}4&%VQ8HimNZV;CQ&=vS5GW-Imj5vf%hw7sPEiD9dk+5%}`{iYMt}r6HIN;n|M?$FjX^}E@s?YAS zGDR&pEc@ZsQpT&I{ofDVJ?U5eW1k>arMl*4&xv(7y&yl9df>k?<(axm620=VjmJm# z&Yhmyf5JZMgwal2XO&SA0*U=Z8E|? zb#{o%+o+E5YmfZ(gYez=2UqVGc=^6G<)(^W@Z7@0OylHX(}RT9@!GWUFAt5WK8xmB zIo5>v-rPkH8x0}hX42RiW9e}E$s4bNa?Ay+f{63QqtX6@69q>nd4cuo^C=_APn`~l zuh&MNopt9t5OrVa>kTb$S`Ro=tCHQhvn%4KxUup6jJ3%NTdN~y)%^9S*e^25hcjm*sV z9b|GnL%P`s7p)#;F{5Ic+>wCbt8RtyM@!T${+Ve^E04%nNuWI5btl)y{aO;oB~#XJ zB3JoK0%fPBgE>BlnIZWui4unAkx>r|0srWQ4pTvV8bdIYlOhS|P?TJYC{nmxzinGt Mx_HOd#F%*Rf4?bCDgXcg diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angel_smile.png index 39a85c39854b1d329a666ca2d15f3fd094a41175..559e5e71a3415ea24f23cedb9b88cc1862a569df 100644 GIT binary patch delta 1152 zcmV-`1b_RE3X}BW_EeI{UvbD07r3Ffnvgoy?Q1G%SU|8D=m;24n zGxOaGTuK^WeE28d%$)O^Gv}OdCcrtf6!3q^ZvelAur~NC?tlK*EVtt`<(a6%n!SNq zT7)%aq`zfOuW1`?Ykb6aTR05tvfTY&D)+#&2;~_AwF;AU(EkxM9f6WGTl!ni={2#@ zw#G+%t=0Zdp*PkK?pf)YwpO~uz;Ow+(#FCys67DnPlDrJm@bFaDRBPKgNdyXPw{v-{epo1w3vC|-FS@8Fp&!g9Wc8h%+$y&nceL$AX4 zNw_@>&O9hiQrbtYjjw8kd!feT2cNxi;PT2pg}&oqxw^4#HKFG7QL_S?%7(Ew;N~#_ z%4U zY1Xujw$(l}9S@-ynzarGqNOTR)a=J<--oOBF_ybhSnNz>?qVz>)!{fB5}1~awVVy{ zG8e|&g-8~gqgif>W#x~zQ8#nZ48szp4}OU88Yqpx>U&Cx{Qz9O-^kUO$ycug7`fW_ z;A&0Z7=PC%!v#^}E>Sw%8iBf}F)U&F;Mw$jD3y(G({*B`O92~15aoX@~B zQL79~nEvpVWQ&UujZf`qwluUg#m;YYl6}H@I~D8Tsu)RY8lI6;cfchr&x@htyft-0 zI?9$UP!nyUM44dQ8*sD`qEPkw@LWEQVQorFHdjA@pCSd4>{SxKei6xNUaUXV7p)Zk z&wtzq22O^FUlf!}r!^kLs(S{*+Ema(IIG}Hhz;>-s%AHZZ|$HyCzO%gC>G0NSuBlV z^xFuUb3*v>%^=20lMI-$2s|xEP$hC=&Dzw8@)NC1QT>D+y^c;xx?yeTQF>1$QF|hs z)5iii{dyoZ?}u^an?&5#v+O`h!cmpdNq?0OV;Gv{`-$u;m&42rLP59~#8{^1bv|`o zyEElx+zX?R%l#tyeXrfB6%t5s7^-L|R$015ft)}ygmuSbA(QzG%5_|@Ll?+0g{riR zWlmHf&gDDhPnG~mB-cfua5hBSTjT{{e1);?OC$?%C~J&?PsBu=i$lFYozrcgXL*9f zE>I+6?W28#ahGQfX$1nL>lUiK<1DUR8VN4sT7vR{aZh|2Vqs Sev4870000X*oxBR&4;X4h6#0-Z2b>r;59e-hzY zpSB8f64=FfUxMOwi24aqARGu24K@?>#OOOy$3gJ|0eJ|B$tC4gN366hhDga$v-$%1x3X;7M6&T$XXKyFr%n^pJ5dE=geG2kp< zQYWEf4`h=7J+(`;9cvH*K2XjQZ`<4aB)Xz*zts=M)Qx>mE`!$YBDo|caR4!V7GV25 zcz-qt9bS#n5>Y!fkV>)t)wOQ66B*Ek{V%O{zo#Z$uri=EV(u2ID`7m@q^O6xO>0++ zC1Kn+o^ks%3r45hel6o#6gHHnmh4;tNm{yLp)6}&|0n6CGQKvj1_dqM0Li8BvRyY> z@$0obBO}FS!K339Zv0+yZBZH{8xgZNxqlx%Kub3iE1*I+BO>X7}j5mh3d%Ff7sJleYZO-pZ;QR)mfNNMo2qzKeM*jp8 z!*gUZWiSwr`)PkL!j?U&@TJBfSHJ`k7{W*ygngGM5#IG_t1wr6awE?(d-E*kdw-zG zuaQz>3`ha-W{89!6aoRv7oo5KV;0yB#z>5}Ma$BRWZxBN-nc()6~0=0TL3!akP zzpKzsH_`uYBL6(ZK6*-i@{;=QCG*Ey=9jPhe;=8%{`#lG&CW*J{_t1+9IW;yP~m@o z;;$gp-$APXgH`?qtNjYq`X8qKFGBlAl-~bHz4s9YpJR>xM;rc+G5#NC`aj<6eWLB> zMDx!{mS2;szNOjyw@bA8n_~GZ)&75q?bJw*snMPnGQ2Kk`&}uG`k(IfEz{{|hU5PX z=fAnmf3scwXS@H;_V`lh^R>wLYl;8gBLB%EOg4ePXV?Fl+3;gl!;jgGe`hxSnAiGa zLHqATU4Iw%{#e%kbk)pX%O?F_Kl{a&r7yOv__Jl`drldP3zHrFS%kTs2q$w*(PUy^crk&6lf9F%?hV5fcYa4NiIfu- z4hNchwR7+BB(*GUO!Hv6M}zzSDGKHu*g4 zWXYW1(lvwUD@(J-q{GE`t^_)(aLlsGd+=g`qKZ(@!d{I(FB%UsNIOsElR6TTa8y#F zH|5_-hDAraM75k+ek@3IYPC;3`Rd-<+mlu7lM@a|Ja(TH(`p>}pircv-fyN+Iag}b z6sHwVUTSZaFn(5D?yTY2C$OM%vu3MmQ@_uIo!U>2326jOQP2!x_TX2VInPE(tF3*~ z4`z=LRw4HQ#fuEq7ZTW%!fTx*1l(OZTEsm~#E$SgxlCNZZKqN+)1i8ffD6BP*8vAc zzKD-(%CjVr4sgY0Y&`BTSK{Cy8$Rg>#aS8c8W#==xIJ+bQ4rmc@Pt#8GhaYBUP?n=OGLgd1;Z@^ z#4Q5EE(FLg1jR4~$uI@ZGY8K!3D7YE(lQ0tGzHl+1kpDP-8TrrITGDH5#Ton_?|2_!* zKMCPK5|>Cbmr6IqLLL7=3jRO~`9KZ-K@9&w4&Xo)??V&oMjG)z5b{9~^Fa{zL=*Bv z6!S+H_e2!`LlFN&5&uLI|3wo2Mico)75_#Q{YV%7NEZJ{7V$|L^GF!-N*eP@8uv;Z z|4JDDN*VrtOB?)49QsWk|4bbJP9M!rFUwap%~?J6O(6JBBlA-x{81qPP$B|5YjfS1JEiD*sk1|5q#iS1kTmEBIP2|5z;l zSS|lqF8*0B?^rPNT{81sGyhsJ|64KtTQdJ#GXGqEGyh#P|6MfyT{Zq*HUC~U|6Vr# zUpD_=H}7FR^Iubz|7Sw?YC-mCLiuPx|7b(~ZA1TPME_|; z{cA)R|7%D8Ye@8QO!ab2^>k1Fa8LbmPycgJlRN=DRQH;H`m4N!0fcTn#_?v{;@th<*!|(z_vPUK=HU72=Kt#C|LW!c?&|;V z>;L@w|NZ>`{r&&`{{R2~lkou_e95|4kL3#ue zDzry$9I{kPmZU;94&lOr=?obn7Vh0Ua?CsxN@r0ay=OdteQU<6RjXgp)@|$YtYpDw zTB03WRSFa+NsRt5+Scw+&4lK3_=;t!R8OEm@5IT~t_M1T^ay>L#fcLre@>Es{?QXB zjv8#)2$ckMRGISJ9jObAD$xC0IvWKe+w5KKTq2h7+MnKB{BJ5YoWLi|7j4Kb+D zK?ur3xDY+&)DeORDZ~)Nj2qNpj*SY%;|(#VERn=1#du@nMI|Z-=9pv(6c7MA1~eh| diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/angry_smile.png index dd07d3e6ec6e80601f3566c87c0ce952735419f4..c05d2be3a7972ec4f2d9f5354a9c1dae719d1805 100644 GIT binary patch delta 1201 zcmV;i1Wx3$g6vq)-cAK&zV!#CqTMKRJ22-XBFbvCp z1xi~f6p+QnASfX&h4R5DCScGI0!>svs_~1dwxE7MBPC)83Q80bAgxls*4UJ1JJXr> z-p_O1Oq*6(gNZNs=e^u}&hMUk&w1ze`mNFE)t!JCkw;W2s(%#KM^qUZ)47e+yUEmU7+GE?&b`)1BZ5Do~gzIs9l%!N%^@XQ=oHyhTb zLeWepOo042cw>t!P>85S|ZI3N2_m*Si$QBT%0CR zC&SZ;P%s@1z$YD6_a84ld{NECkL$?Gf3=)^Cn?_`+vEuEM<0u=S{UJoI!^qQmZ5fTPs5o zw{l82c~YwOswr3-BnL|$4THS`%zXm$cAxkc&%)#Iu2pRopOOK*if>9s!?Xl%X z77!8@=Cz;X{1Pxyqwvc@!3;Sr_aNJzGr$hc>We?E4@U9>j*Z%?kNV#4HMd+6)2Nx( z($d=1pF^eJTDneEh>hC*r#rOMl`1D~6757)qFWJFMaF#HU2XRT|3CCM;*HOY@F{}; P00000NkvXXu0mjfO&4T( delta 1333 zcmV-511K~zYIt(9A7lt&cD ze>2~=yUAwVT-?;8#1s`Ti3Tsp#!JB37Df7?f9vWW6U4P??0_f9X?>(t9J-{)_lb6tB9UXMCUEQ zK;=}ZoCfokqFb97`uGjw+O$V_UV6O)A?D-?K!fN!O~bM5%xmIWqn)i&(zh!A}b zGCS2e3szaMGdiB#0I$4D?B!bHZ9FC9Gt*Z+&Vew-_|fWG?A3-cx5tYes6a;l0>lX1 zS(bgmNFb=fA?$n~vcDIcG-!vd?Mb$@Ct1>( zq_HcV5m1W89$0e2&6Z9NTkqv(PL>$Locsn?@P9c}I7GHKkU*UZhp_VUA)U%5&A}A- zvRM)6;*#OJ*2SeD1OUcgG;*S=Er{~TkKuIyHc;n;L*y4drO`@)00D=V&7?IUnN;Fq zeB>rv?*yaSHnos7&j-2H8>7aRf>Sp@E5z+KShdwS;gHCMXG|;5a(L=({*7Q^3F68l zM1LwVoLH;v0;TPj3HbcTXxGTjoise`9#x?>5VB^}u5fO&N>_nDXUQO=_rMr1hGZ(m zKs-)=JWhW+K`fcVZAqq$_fzDuFhv1W_`I-Y)Iz5BWZ_k{D^%-QTzTGMw4)q4d;544 zk24TYpbPx?YwGdW)HAWBo^jRlczEttu7AC=iTM)>G2R07%}dyGo*e~mwyWw$Bx0aT z07E>L=EB`hieFsMgob5It*Iw};uM~=!nqANT7xziUlGp5Ci2$41(}YC4VmbEOM$;g3n``6hLq!waui9WGhQoFDl^ZQg2`S>C(>!@+VKINjc<=? zTz1YWcX`(DUX0e21E0Sq^IUG+ZhsGX!jNYRuq3zuBfv<|nv~-(q>S`zKY(Zb?hasA z?zKJnS(E^ushgMA#`kZ6_Dk57g=I->DGf&BI7%q3aFmAWbIITLHP)0_-vK)#(OB<4 z!gEB{pqxWa(}{ozpT`M@P*=|bV9lt-s;b4Vs>5EmJc?z%7Kz4w94p~t!Y;D{#lT`< r9#EV004>1ztUvwa*Y=;_|A+kz63TCW>N1H800000NkvXXu0mjfD}{^B diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.gif index 0b822cd9c8aea1c065c5480bd6789c1592b5bf4e..4162a7b24df8e235ea5485073003b702562c3122 100644 GIT binary patch delta 574 zcmV-E0>S<32;2o^M@dFFIbjz77XbDE0Hp!~s0IeE1O%=J2dM}Mtq2IV0|T)H1hfPM zxB>#c006QG2(<_ZwG0fa5D=;n5v>*$tr;1w9v-hBAH5L~up%O~EiJe=H@Q4Kx<5a} z4i3--1=9%$k*pYL(Gd~U6cpJJ5!(_H+!hw!7Z=tW8_^#h*&7?)85!Cf9OD}s-6A60 zB_-w{AmAq_>LeuKDJkYDDdsIL=PoYpDJktQFYqiZ@-8m*GBWcuHS{(%`8PNHJ3Ib8 zJ^wyFyh1{~Mn=9!NRwRwD*~67laK*32LAi||NsA!;Q>N_A^8LW003$LEC2ui02crk z06+)-fNFw+goTEJX%0I+jEz1XQx7+ej5`i#g=tF%9i5&X2uYZkMGr748A27PUF9ThNglSevS+vAzXjVlQN>O2hVoVheMO3tDNHjvHLP9?S zRb>Q0;Ne1lG)QS_PaZn*^D6)g^Y}U*P}@=hDgXhNPyqvmiWCC)EmL#mLV^tt6I?j6 zu%bmo?v$y?=+4j>3>0kqup#1tJ1-De{0M@B0tPXIwlo+*-K@%G67F03dipGsj4xB(i_=I7@3!3~TgvN*g4v--mD1zpq8Zs6HC=g(Q MjOAh-mjwaQFE6z*F}F1}w>CDo zH#fLAIJr7Hxja0&Jw3WVKg13W&;=_62cV~#1+nSn_5&<(6{rUO*`uhI+`~Lj={{8*`{{H{}|C3PxJdt*w2^>hUpuvNf5@IT-FyTQ; zf7Y0glV{ODMs!MSSi@%_!A34dP#Hr-$BKlAIv5#K=E?{cj0R$I!y}DNG7SD;Qp5m@ z&7VBlcr0WgjT)O{DD=TZD2LIbM$=dzlnE1@C}?b=K{F;npMOUS%4pq+CJLN{A-I%T z%a#j+L~fq2Z3`ly1}IGwC&xR^{^K#LU(1jB(h`n@KOkl;1E?^dSLF@!Z!aFv! zXx>~T0ENw5-7NFSGd6>ckd+$4iUs8h`gORKtfeZvnu)=Kr8RUow2TX8)363QAA0~guF-Uz94(CvY93~hL F06P#eEW-c* diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/broken_heart.png index 775146fde1cd8de37b6ffa436c376721dcc3459f..a711c0d8d8505409f0285fd92257eda1ba3a42cd 100644 GIT binary patch delta 10 RcmdnX`I%#a^2Xc%762Ga1Lpt$ delta 83 zcmey&v6pj#vIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6xBu>b(4&=|b{ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.gif index 9587194917856e64c9c206cd4d74cad0424d6980..0e420cba4af510c616dbfcad2b48acddc94da29f 100644 GIT binary patch delta 733 zcmV<30wVpo39<=)M@dFFIbjz77XbGF0GD6@mtg>^ZUL@w0D>7oq(qXYk?1OKB3|EC83s0RO|2>+!C|ECWB zs|f$A3IDAM|F8`IwGZW~6XvcL@T?I3sS^LH8vm;s{jD7u=CT^*w;lJh692Oh{k0MQ zxfB1o6aTvv|GtwB0UT!jyD|T}HvhFa|F$~)y+8lFKlj2N_rxCmz!?9+8vnx@{lgsp z#~%O49`MB^_sAjj%qRcMA^*)H|H&o)&nExSB>&YY|JW=4+AaUwFaE?b{n0o5-7){v zIR4=?|Km0Nx9vlQjZE4))#u_v8Qi=>Puv|Ns7zp#p4^umW9^umW9^ zumVMYA^8LW004&oEC2ui02crk06+-;01pWqIM9$mLj)5FRHK54l7}Y%05D-fA_x~Q zR-7?oh9Dpe9aJQ_@+3)%4jnjXu&|*-hCc}nxuGEkO%x|inkY$9WJ#StIo==?Xef({ zAV`5I#mHjC3KbC?biffN%g~s5)MObkB8wV-J%tp;474LhnLLCD`C-#zN1&?(bx7gT zBxi#LI~g!Q8iS4<9YYO`2tuTY;UZC@2nhn^Nyeu&_>35;r-BO>8Br`iFn|CABvzsj z;oxP2o|tPcY~a9}!v+f$DoCKP2CmrKxMTKNqlE+sEo=JNj`>Ce89ZsgRH-6nj-We# zBZMjplwnL4oH=zSAwnd`mq8-}5s%!nVG5HbO^yTz@WaP?7(iOc5Y%H2(JU^C@JynF z0D5 zK!xbQfl~(*@PH9iSmA^a9kGt#J^WY;6pO;2$?gP(cN-O(1~; PH~e9wLI)j$TR;FiQG-Md delta 979 zcmWmCc}$ZB00r=`rS~z87OHJwEflJb4p8bk(9oh0bkQ+P#**v)oj=pxWq&Qg@r~Y8d+$fuwiGTo&y`# z1REa>ufWbhGld&y;^8tEEmZT-!bd9)t$bXe2+&3mqFsp2U^s%&6};FaT56R%yBvb1 zFxVxqO9RbPG|R}A$fXYHl0&w1HPYW1hRzVOD->NJ=nlnIN*H=X=oP^!LWon0zHs!1 zV;}-QOE6eoB{#v59Oz3z-$r!l(4B(5O>k}|2hz}=<{ygm4@cqJDqN?m#t=n{8&V9* z$QyDD%P}IyXe552M8Oq>u~(mssQfPFi*faeOG&yEuvst|UD%@I>QQ48~&N zQQ+&6u=c>P$rzZA;AGv-oEYFYduV5B~y|AK~Sn2&^FR zF9IYG08r6RJ7Q8UGiU^Hmxw2*{C^UH6Ck>{a$QKZA&((iH(jKu(qtP7%Q`9r4~7ao zqoFf@RT1&;(c4R`N7RRE4GfOnBUe-Vwi6}k z#ZS)2Qjcce@BQ-ex$2$Yu1YlwF=vA()24mLJAc#8j+B-w>Wr2jBu+%Lq`v4}gZr4-d^Y7^0gd%h{PUQS(TV7r!D+?m VXOm|3IwlP4_nQ{Kqca&q>VIVD@ALow diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/confused_smile.png index d69a6f923bd9f3dc5b15d9f70e1ec75e661da809..e0b8e5c6f11467dbe09785ebf3aafcdc9c581e1f 100644 GIT binary patch delta 10 RcmbQvd6r{>^2S^(7627f19boZ delta 83 zcmX@hF`aXQvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6z*umAv$EEr1w diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png index dd610b8f011bd65a2543bcbd882299f133823204..a1891a3428126f340fec3df988921ff98e60b36b 100644 GIT binary patch delta 1195 zcmV;c1XTN@3cd-DBYy;iNklsvZ)kglo^9 z&wutlMWAZX#D_n7@0qo}S+myKGf~0N<*5Hl|2PRGN=u|n$$uyHM&yf(*}24j4VTk0 zjMK;YN@!XS2bV+sL{IkJj@dbDBinm|%W$-`gZ==NJq7#cLE8uL+itia&dpySQ~?3O z4=naPl!nJPga3R*$ zGKRq29QU7roJ2Da$S~&2GlI^PgTO5UHwjdq4kxEU?Nq3l3_neRBPm*Vg%${UJFtvM z4gTy36YisQ0jBzKoYT(>HbYJ`+-IALSohsH4_r5uzJHR5_`i4ns#V+{C%~ccO3xPf z`3Ee+Wr;ZmUqVkQ6eQp@&R2wjHl(|{cz7yXGosn_S`^o+C%fs`yDouEuSU_leJmUn z*sq2Csc@wWDi`6h#2kcY()h6|uX>)0Y(1iy&0}4VRbQzhJ(|k)H)GxJoYlkCmdWZG zEwXP6rhjdncB}TcEHMY+KKw6w5uBO}?HSOuhW@i_T!00YeLfmfH_c5&b6zT2Rz|zy zp#$@2Z~0ol*D)>cVY;^Avcw#O_mY=li{oT99V8{Ej!F3qY-*~dqg<&u^{5Iv(<@%p z1h=5qTW8ZzkD)3=KAV!LPw3u5`Xhfc-464+lDHp`+Hb-rblU6=oQUE zZQ*Qw4<&m$-0!7=@+5+7-!S*+1)lW>aC%FJz?GJzGE~lM9;3hGQx$Wm7iHC5P@CV% z2ccq&XJ4wWDNE*N{X5*Kf0uBr{te5zEiIV@HWTP57ks|gS{8QDle2#u$G?mx`|TLA z-+zkX*oF}}B?6b+4@ElL_Kt$x>NNjidfN*K2aE0~==v2$I(V+KRq&_1=&ZDLM^RQ} z4!_kggDPJehqFh}z4y6b3KIxdEhoR_7_;{@(0yf~z=B^`P}+JkrLc+jTYnXBj+aX- zZT)(25`}9=^8FjJx4_$1#o^10=SIGT#((Ri9EmAP!zr3YO;;^b$~s8RsWleiLhn z-nBo6m3_BkcFx+!_P<=vqup~J>?BE4BAt(@Br>+_?yK!~{Q>W?8WSrDqALIZ002ov JPDHLkV1kRkRY?E< delta 1297 zcmV+s1@8L338M;-BYyw{b3#c}2nYxWd=l%W8D+X_k z@PCQ(-wu6Vmj`G98i4wo0{C;<4qOPD@z_+~i+e@x^SU;o|t30 zcyn5@HiXc&2Y=1@@&APTysi@96JmW^Y1;<61->;<)(F#AfDjPvgy9YtJPqj#tULss z>Z8D0K{I}PN_ZBmI_dd%E|>Qy`{8YZnT?3#B}6)axYG{`FlwNv7D}5T+y+1GP}J@c zJn(h^#L_Vbcf*fx<)f`?;8W~}URIj8A++Rquv1_wkbe?vIc_Nc-%cpq0Iko%>=tl^dwlbV%oUVg?qs^ zp!*;^)qfg7I2LQUiZn5Fs)FQYlv_tj1@e(ahSRj3{tJKGP3|Nukcx{xN9gO0(AA#? znaiecAIy9dbRC9HRRB$6@CL$uC@w&=!XT||%C@BUY62@GK|v&HXB~!90CZiBW#LMJ zHHr!xhRVkw><4HVgV$qrfT4qMgL^HMv=H;OFn@3@`#$E~U&5?%1Ei#GbtMjmMkJiV zl=Hb(u^TF$1v`nFwgAiyfO=;h9`-|}Qyy`CsO{=-qd9eUFHZBsx?_~hGMHgV7>8O4YuxKBtJZsUvjXK8kArX(4L^w8uN>hrpebFR6WbSsq1Bj(+NCw>v4{_L&% zI8Lxqfs$D(3^J9QQ8;j9(l|!`gf%Blj79Fp_jGfg<8`XdJ$MEWWM@$260#NkOL2Y+ zq(H#}pH5><5gIwT97P}a967z7(404!RexE41N>v~!WVC@VM6??mj_@>laqWQe8^(#(Z*>U#fD0Nj{7>VY` z5L=Q-NfNe3Vexo-id;HrhmK{9-&1-yBHGWKVh1t9#mW=Ewm1Rzjd;>oTt1s3-G6}5 zG&n4YrfDdJp=-3fQVoR$mX)oOQvk^%^!x#78>KW<#**5d0nKt(W4JR!qql`nN)?|8 zjU4G3m5;nS&ttl-ez1f~yTMf?(S(M|H537bPDopj%1mysEhVcAh(QJ-KKg z92Nik&QoN8H=0tbk6ZK3rg zh;)KO%Pt8Gm5Wp$a}GYfM~46vqjaS1GU*S&)}YUt*)8t*MQPX*9+* zO|&&pn;1=eB#j!4ADSkmo-{nDf#Gy$;|gqF8FTcInDR!d7;3cDH_ukAKLpQ=QadX-kK1Avc#F ze7C|dhT27CQ`OXjscN%N#$p2OLn!A$UY@W9E%@vo>(&81J<|EMX}AZvHigMXp!;*+ zr@cT~ijw?GpNxqOZOu7fqNN2lwrmkjw*|jGo|Xpx_U(YzD+2@gvma=93~1U0^u7=L z#>g#@vv?htW`6|x2|u$#*@!JL3bz|`8#iKl>sD#ETkv0RWM*P;?ONy@#78dzUnRib zdjS65OQ4N?2z}^f?u?7OslhjZ@gu<85HMB%98CreJO@7=^w?~e-?>xZ%@+J;ecwKG z$Hp3iH(z)VzTwZHdEcRjS%4=KaNP@Zap5cLflC>{g@1b}wkH_hIWJ~jdfJ$OjSk}A zL4g-p@YmsVV$NZ!QBLPZU8PbHy0h;bUIy11`rH6!G-C$_GJp*6A7G!AtTsr34 z(w5szgtkylF6>ML{u%}vABVvr(}HKC>r-Yvj^3GDH#K>Ruvdc&P1dDgvL<=CU75(T zq|PJ&KgL7vJ;dFz{DnoP1+RwlS>=JmGeFwq^?#_!i8iEN$bi=FSZ<$9Rp7>W;1nzE zm)+2ZzlFgf(}GW+G+C0P;e5JEmPr23bGt*Vm}^-od994`zynGFVAR`qfjHowXwVH7 znYY4QlQg3OEJ?yd0+qx`e47*14x3acmcX^K3~LJf!^i#wXIP%0A!FW_ye#pubp_P$ zmVcFUI$qfuU|vDh(a@V7hW{eZhOh#{l8vjM06(lzW!0=;SB|d1NP+EEsO2q_@6C^b z>qrFWMe|-|r8##%YvlP5RzN~`VXPK75vCxfrs`8s{N5@w<%DB6KN_^Xe!KnW@0+)D*76-DFBW01$YgkD&JV3$_mUW1huGkqjZ-hu1#A-&(OFSj69lT3= zHv=QQ?M5ljW>uHSA(DUTlQFTO?VTR%|0;UPqN$$n^NQHl^F2p32Yl>~-Vgnvl|5`RUekbm_@5om^C5L68P zN7QtQXeztQA8qCqwRZ2_-Spn;?(V(Yy=Ob;eEZ|v>+Y;U&;wtd^S#agOW6;i2>>4Ch5lw(r@occe^BORGJ=> zqNk*R{nFWIyqJjrNg7sPpQcu=Qnam2lCFfJDSSYttbe?mp}|2`Y~70SV#_KTe!|(Z z0~T$-$lSn4bzwvgf&l*-C|?VkzJmBA_<9QrKfc`gF2G-@6puDF0b~G7AX2q%9T~^r zb~H+Q@HTeGZj5q^qWA&KR2Rln57=>-j>1GYjC=~ec7SQY>sLsOPI4=mq{K8?(A*3V z$&(*3c7N?+rQeTPRgC|`jTB9HW2Vo6ZGkJ0oAa9Wb_V|Z0RGrZ<>z1GuU<%FNeS%S z32+3!kW`195#Ctq)AN;RMJ1*k1OpHRdJ-ULZ>a#+C2(yL5bdk|;JV-lR(=GjQaJVr z?7wbd6xD@e>7)s?5;^VT*$`T8U|PZ4BA4vc41a-(cL`j&OEzPZ%{T-uM+sbxkX zDO?u@_d(;6u%#Lzr~SaDye#X92cWD3(~g5{gX58pkK5iy6pSYv#uLu$I8`Xo6bc@N zC7U5009X&;1KNr8g1;CXdrrqKt}CIw@geVdQ3*%|<6^KZFLPHg9zgZmF@}xmhHF z=OfX%RT8>0t979_X27~L=j0|3pr#F`EHkh5e}X#~Dz1ZAuR%>4KwvJpHB+$I;o6N9 z!^4?*i9?ZT`UbO}ERKuJN{mE550dv#(|-n;X>gnzT$Ze;;^*EpXD>`JG@K=svPq?E zhQk);uTFB|dY0;C3%$$*@>OF@4CKjs@=a8U>;X zG-`pMwzh=D%PVN!+(2)Oc-q^Dpc1~WF2iF`G#nZ0N7+*PPr(;1GXPXHL9Xe$2~ zIY$4%SGchkDoR~U!}Jel$I`DBR!iP?vwBaE=6#TyG09l> z^`Ey|W^8baOjMpLuyM`-g$gNc6qL#n&Kl9g0ja3@}kHQv)}5qUsiS z>L^sL{T6sT982Gum%Lz;?a2OukyEwAd$|wrsv(btju?jT&2TLJ!#_yoBhPJ64Ll9B q0&O`D@C(qJ^B2Og^!UFL0Dl8k;~!Tgth@UF0000IJQ$`^nMpInYiov}!P+MYR zUQ|VYHelevH8Vv!Jw6Eux%MU{Ayrm2z+*yGK!GAf2open;J^W-M+FEE9-!b70vHzy z6d+Le@PdGVj{*p=aL}NEHZHHGSh%1egUbsrFIccJ#a+0YI16=|a%9_)DP3$9s^a0v z7AZ=E2x)=^j23=2!C+W|#MUhzJaXkQkt9ri2rz`WWS9YIhmJ`%ZUg`TBE$z3y>C#G z5mrG(ibp#J49Gg5z=w@A?1P2BV z3>c76#8a>t6C_mVU}A`C*Fi!kaF8O#3~;b4c*tO?B}@woX8sB{=F5zkD`n1{@kOWz LqC`!8#{OVj^LMHZ(>&K0gWy!QLk( zwO2N#T^fHhFEKnj0RcET0RSN)AS;?(gH#_bF6$%SjR*)pf`tkdo54;Nb+3!-s{4SnxoF3>vqIJQ$`^nMpInYiov}!P+MYR zUQ|VYHelevH8Vv!Jw6Eux%MU{Ayrm2z+*yGK!GAf2open;J^W-M+FEE9-!b70vHzy z6d+Le@PdGVj{*p=aL}NEHZHHGSh%1egUbsrFIccJ#a+0YI16=|a%9_)DP3$9s^a0v z7AZ=E2x)=^j23=2!C+W|#MUhzJaXkQkt9ri2rz`WWS9YIhmJ`%ZUg`TBE$z3y>C#G z5mrG(ibp#J49Gg5z=w@A?1P2BV z3>c76#8a>t6C_mVU}A`C*Fi!kaF8O#3~;b4c*tO?B}@woX8sB{=F5zkD`n1{@kOWz LqC`!8#{OVj^LMHZ(>&K0gWy!QLk( zwO2N#T^fHhFEKnj0RcET0RSN)AS;?(gH#_bF6$%SjR*)pf`tkdo54;Nb+3!-s{4SnxoF3>vq1ljw>3Hb<+BNhZeNklO=w(I7>1wk%p@~Ok%L2jOp}?++?l!Ob8&Cd zq^4T%z{}xsInOz~=RMyilbHpsH(KKjjX)pJ19S%hNCip)Kc$`g{95bfdhphG!+z9$ z#PoLwoFq6&$R_=tu^xyAN<1))nCH_@e(*oxt?`Ct;C<$QKgiG_sHsBh{SfPg4ZA@E zu8hL$2uywp)go&4OIa38Fr{Py0>{CZTqjzhx6UZnU7Ql3Cce}Dp! zcBtD0EssKW2!>x(cD*j_cxeLUuB8pGg@4AmcMj^GAK-O7r$%PP6n_NI1y8|R@a)x@ zT4;R@njeIr1F+>W*!l86+Q~n?3f>xT*w6g3VmeiR7 zpmg0HMe`QQf^0v6Y-oY8WAMnSX(ZHU0!R9oI+>tw7OxUQ=BCg^g@RICD3dyMnbgo_ zO2sOrqDN|fIK#-0gPXHxQP6^7&%6uGeNa;aQzsKZ-x9osYzk{5urQA;cxXYyYAvXtF1iL8Md>L=-W4P%)$ff{#!U4P+X9O)qpyUCd7Bpnp6ssYz zZ9M>+H`anGiEZl%yM|ap7@hTCQNe=#bsD|rDdfU`ae(ft@N5dLhE)qH0Ads(iYZp; zf95v-^p`SVmHq>_pmSi)Ian8TQ9wbm7qF3phO#MH2@g)IP*VRRqG-jU6^l$|g2V*L znVdmq1+5BH1YAG`v>Hj&!fmUce{SqJU-sg;b(UIVOw>cx zS&+b2eJTgJ&QKVWj;+1@mw{~KG zBwR(pE=b7G`4;RvG65X^w`S1-d`Rx>lbm`Ma-$G3ev>e0V2NPy?P>0WJ)c6;uFruN z(@uW&M%vsHX!RHuzloC_VOiiuZAn`nc98H3X(#{14foI$EpIPyH_#Q#0H=YGVE$oc gYrA3i{~dn=Ck15*vEe9t00000NkvWtM6N<$f|D-+mjD0& delta 1139 zcmV-(1dRLn2*wGJBVYgob3#c}2nYxWdGHv6 z@IDK_A7=$4gp7#PA;=1+ym=4zrA-e zzaCe&>xi(qA1VBTl&6s5AD}>}6B_qG+oO;kfzel$J+BM9UYY{AtJdH~_-9;r=dk|y z0dCiGYGh7K;YV;w;3`-PuDxEVhxXT?^+6ap1lt~i-7gO%o!rx_;O)`yK^7)Ya;je| z9ghp_*+j*SFMhDbPw&bzRrU_t*ni{A4Ta_J;M z?|*f8I)PS$s(BRvF$y8Y6e*icLZ>4dC= z`>Rzbs`n96v|`bUMP^cdV*KPx&!O{zRs|{oB|rtV3Z=PaUd{6akshR47OW3hmLI(v zWqmD2RnbrjIAcPj2OzNuZh~c~v!0BL;D0iCu}C^q`UkvJa=E$)h=qWKpo=txk?aID zc+HkLkseIr5)x|i{0(>$H}7iW+~^dU`SPkeXlrvLcXVxs%UL8O-dz%lAlU@$dIcc9 z;t*9Q`D$;>&RoPTHy|O!G+AU@19EE=>g!g)HCsl{&tb0=(2`)48`XK3jhOgg#Y zn&%{)+%PSjL-f2!py8S^^%YB<>ji$)e~I)CQ5pYWq}v9nzldeAi)=s zPVS2v8SBFR2Ccw;;BKJDuK;I(F~9z>@@f0e@c%ph1}6n&33R+`Y5)KL00>D%PDHLk FV1gr;49x%l diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.gif index f8ffc54345b0346804b98ec2be137f9f5a8dc839..5294ec488dbe44117f3ae6836b932fd3b6a27b52 100644 GIT binary patch delta 483 zcmV<90UZ9w1^NSjM@dFFIbjz77XbAD0H>&>tFET5udK1Mu(h_dwz;vlxV5>tx4ONy zy1KZ#yt%x;xWK@^#>d6S$-~FU#>mRV%FM^j&dkow&Ck%y*4NY3*3{kI+}_{Z;o{%p z+I_7?d$IE?CghDz-#C00M=G7ZX5( Z3Jv-b#DOa^E*Q|nw5cWo7w`lD06RHt>_q?o literal 712 zcmZ?wbhEHb6lV};_!h;me8tk$>z1uszh?c0wHr5W*t%`Yww)Wd@7TI?=k}euw(r`z zZP%_HyLa#0y=Uj1{X6#T-F@J|zJrJMA3J{Z_{qb^PaHdO>d1*xM^BwOe)im%bLY>V zzi{@-wM$p8U%Gbv^3`is?%us~@BW>8_wGJ?bpP>_hfkh9dh+D)lc$fLK6~=)`P1jm zpFVr>^yRDPFJHZQ`TFInS1(_I$XBo5ym|vduiw0V{T7Jcy?F;j?}6mockkc62cdWG zKfL?+@%_h-A3uHi@aYqf{PgMbr_Vt2<CsUFB2hNF8fw~6LVRI;YXrLd zovd}Wbk_*=wna&BhxYip+3H${&f3!{$Lc?4v#YhcKdaoSD0vp|^M}0syjkRXqg0uk z?wt4E!lc^8qeb8l{DSDqfW;3SbQ!q9UIscI zZDo)!jB^NF*nXs4P?gJYK|<%Qd@df2i4m+S-U56rI*Cq`I|bO~BX;TBNMh<&b!gVR z8Mttvb5m%KfytqgPM>9NNhJnFB1xj^%2^yAH->gxU+0uGqu^4IV3U|r){ltO+jOJ1 ws_6=t{CeQP!Y^l0@#eo1cz7~jO~up|_cuE>GB8*J0KYP0CIA2c diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/envelope.png index b4180c5b36831cb62cc9ec49b22f7fd73136f4b8..44398ad137f1d9591692ef073059d709bac99762 100644 GIT binary patch literal 760 zcmbu+>rYZ)90%}|sHtfs)0IYVDqC(=uKA*+wKS|OBd=S%NS)@IT29m1T$$Q(D)Z7T zEnbwh%*#~NMDPHnP=GPO6olp!Cs(;03qM%wc`lE`TjcV7|6Jt% zTI6&10-jJL5G@Ip{s<+~l~t)^Rkk9Pi8nUZr=K7XmQ>ofgsgx?ULZw!!H7bo( zt=U#udnclx4YJ<}iC9hqo?{7gljfL_J5iE1FkCjux|?)+F#xxO5Oa=8EYgscZUTb5h&- z1;LV4O!#1Uj-a?MzCV_|S*E^l&Yo9;Xs000A)Nkla?pD^>+YCEX=j_hR;~PY97bGVBljqHO&iOshx&2utU%|(cbXGED z#(oCy8-Vr(=}iE?WDD-pY3tc(ou|y$_q@ud=Kh$KO65{r-ZV{&ja>^=Mg1{baDP8H zJY~j)f*^P>JAeB?H{06qb>BC2bN>8m1$irv@$u{bOOkXwTW}ZO3s0G`&!Z@sfB10D zP&EyM14D2e8`WABVHhHcBFM4?)4YJ?Zbho)+f6$N1wp;RhjpnnidU|3pSG=Bih9Img2r_7iEU}oj<2tN*@+5j_8?u1w^D1(Zc%1 z6S_Zrk2vRama0`wu3Mo}xk#>CAY zr=fAhTjKbl_bbdV%tDf6{P5jR5JmAQABG|37v@kXS{VIy9J=1ra92XZQ2>Ra1w~OY z)PFw=#u%a~Its=ZhWbaKC@Km?>oi1TxNVp5(%Q$>zJ5rO3?ixvNs@52Zva+42iq<; zgx4L5@4rIM%AxymFJxIk6h)_YCd)FqE?>b*Yagnnp-DS=JSX5`7@%yIaq&Vs6y=mIVRV*CC4Xp|ie|kTq9}ss{ovy}5JUl-bNK!N48s6` zT>-$&?yerJuC1bMm+LO?yurXww#!&uTSa$Q4*=X`M3fA}aD8uY_mh9N{)TPa=kEAj zwYIjRr~3*zIy(17QT+0a<+c&guSE3hgN)^^o*i=9GWiN#0~9j$6_ZVii~s-t00>D% JPDHLkV1jSw+Bg6J diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/heart.gif index 77e0fe8bfa217f89fff2bcff106c29dfd57897a6..160be8eff867260e6639fc13185db595098fddd1 100644 GIT binary patch delta 547 zcmV+;0^I$>2($%KM@dFFIbjz77XbDE0IvW5s{{nE1O%%I39AeYsSgjg0s^uH1-b$P zz5oEY1O&4R3bYFgxDF1y4i2mq7Ofc>uO1$-AtA6MBeX3owlXreH8qic8(`ZK65ACO z-xn9x8ynmh7~UBf+Z`R_8ynOiA=)4y-6bX8Cnx40AnGM0;VCKPEG+IRDe5gP@Gmd& zE-vmcF!eGr^ENj1H#hk=H~2X@{X0AUJw5+EKDFN0E>-q2R`||Sq_V)ex`Tzd@lc51-emj2O60hn;Hj2l$Aan zJEWvG3qK1tr93+wL7-kz0VXWAx45??15}5ETum2GvA$kiPCyYBMpl$vRYVg7Jx#G) zKr1>sI^5meq~9w;U0p~VFzD&(f9vQDO4dmNBJ=bjC-Wf!OT>m+76=#u8o02fn8AaU z$njIiPtcVg4P4lufr7v=CIe8|$nnC#4=jVCFepXRMuSzYNVQrp#aILyIC9{aNwa3n z95E)4yP#r*&!0ep`b^=2l9mT1S}0x0wCM;51rae3P~wEut5{Ev2mqyFDHkILK7bhe lp={X$M;iX}p&)}>w+0b_s6B**0)PYnDr7-uNTI<%06QUc;`jgn delta 686 zcmV;f0#W_61;Yq`M@dFFIbjz77XbHx0IdK3uK)n61O%%G2do4Ht^@?H1O%%I39AeY zsSgje0|U1L0t{ok(9v-kEA+RGOvL`3BEiJY(GPgA~xHvd}xja131qIXz3Dyn{*A5QC z5fRE78q6CT*%1-i5)#`I65ACO+!hw!7Z=wX8{8Ne-WeI(8ynjl9o-xp;~N{)AtBlz zAlM@#-6bX8Cnw+|Bjz9=>Ln%NDJkSEEbb{O>ntqlEiLdbFY+!f>@hL!FfjEpGVwGt z^ENj1H#hkvH#hh>IsH33{XISYJw5+EKDncbhCk@_4U>gxFG>-q2R`||Sq_V)ex`TqO+{`~y@{r&&`{{R2~lQ98Y zlRyDYlRyDYlRyDYlRyDCe zLg5L{DpXi_aR{dZ&ZAB)_yl?rCB zj(|vr011<~aO28-dxS$m6F!pY-OIPHULIKzmRV7xu;Igq3uid9P|pS&LLy6^Oqs@q zJpmB!$oww-#X*YaI4Yv2a3E%RK|Wa|pxC~BK^N-=^&yaeaH9MI6POPk#3Ld=ga9M* UsGrYgjR}4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6xZV+H`AWf>L# diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/kiss.gif index 49f31ab49337bb92de7edf4d6d4ca3ec0c7f82eb..ffb23db05a76e7e530ce7a26d658152a37028ef1 100644 GIT binary patch delta 578 zcmV-I0=@mZ2&)AYM@dFFIbjz77XbDE0Hy%}t^)(Bksum>vJ4Ej3=Fpo4Y&vhz6lAf z7Z@~7RnYDz!@3E9v;gZ z8_paY(Gd~b6cpbdAK)1o;vOF4A0NvjBib%5M$_wGBV{mJL5k;^Dr>XMU!R$AsEkjdC+=#(SCmDXlVLnW$JWv{dINyczBbg z0WKZO%kIz5@YU7v+1d5ulEc2@@|E4(c-G%_u{C>9iTs>sR8%XfBF3OGthIUxfgIYUc98WePdYXdDe zGd3|B3jzQFe+wHgGw&}0X0~^AMgb!wJ55T=N8#r^`h~Ys(tS|#s zyl|%?1&9wIQmBaGqNxKa^z0aMVB!P|7%*hO(BTA$APEi;3jo#E!b%FBC=m-m3M@F7vrBch^b1O!fqiJcM?J0K}}R95z= zoZM+?>2oqN7X<}xi-_EpmwzBB`9MbIk(}HUAd;6qt*m@YPw%OM!ZRRJRD7ze{8(N6 zsjBKTHMQqzYA=FIsa*Z-`q|H{DNosrQ~YwO4M_8$xkJ{uT(GBo^RVDQDz z@Vkl0cT>|JKxAh2!@}aHmDL|>>z}r^|LyGdI6LokbKCFjeIzRCv4g{NFR%a3&i`Fq z|G2sR_wxGV_u?!^Z58b;o(1{qE4iyp32TXTU>m$q~u&#+4;)K3sqGY>*`)) zWc*4^eN|HOx3u(cMaA{Lz8e!K-k3D$=G3XTXV3mSbLQXKv;WPVdw=QDhilgSTe$Gw z^5u^=ZhW$7)3Y5r{_WoV=G3V-r%%5-fBwVOs~@jl|9JD}*T;{)J$?G^*|Q&S-u(IY z?eEW@|9=1e_vg>QzkmP#`}hC z4q>gB6B`yD3|?qbXjRH3>gqegD%7PS>k=zFpBc-cE9r+BIhp@;SXHd*XVxivkWyIq zz;&8Q@tG+f1Xev*=^}W+Vw1>80a=qmF2hMzIQ+Y8rTrC?CNDU>z$W!XhN|$g>>2tg zyJP|;cPO=q1n;Vey#3VcwsyhexWGk8&PTo28)6EbTst{Am>GB)5*Bq#KJ3cpu&N^K zBBQJ;&+`KplU%uFET?eXv}ru=*4-d>=Ypfu2_a4IhAI0P4;}VuT7JuCM&My~ArF1L};ymVNR bk%_-nqc+WBt^2Xc~%m5gg1WW(` delta 83 zcmaFOzLjHwvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6y^Vg>-B{TU(v diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif index 73f2e5aaaf418f9f28e1e39dd8ed48e5d1038d42..ceb6e2d9ea3a6496e3df43e6f815567f0d840bb8 100644 GIT binary patch delta 419 zcmV;U0bKs32$Th5M@dFFIbjz77XbDE0GD6@nq>%{Y7nV=EUkh!)`$Vyjsx6{0oacY z+mR31kP+LJ6y28_=avKLm<9Bp1^=lB@S+Iur3?S93jebY|FjS6su1_J6#TOg|F;qR zw-f)l6aT%DkRu(!8vn!__`w|i#T@_0ANIi_|H>f$&m;fMCjZJUlLG-!lUD&_1ONa3 zlhFY)e`?)RH+V?iJYAVFj7 zae|^_jg=xah$yK-0*b(4LZmFAmTE|eAOhVWxB}yaM~^U2!9b7^$cY*#P^3@^X@vzK z58Z4zfFXm;4I4BZ*z!=2n<)(@K$t+(L6n|_yo@NoG=vtUg}C^*F(3c{CQu8d>C%J; N308cCI=u=606VEotU>?) delta 557 zcmbQjx{Slb-P6s&GEtmCoZ+$ReyxMyS_k9pKIS{Uj5qpt zZuIlr?B}~XfpwyWyzOev|7$q^ujTr`j{E;c-v66`i0}Vq{{LI}->ee&zE$MUW`Y0P z1^;Xp{=Z%5{|=%5JB9!65&ORvh{XTzo0zN|a6sb!LCODzr2ZcUBI*A}q<zeo_ndjf%KmY#y{r~^p|Ns9dCo<|xE?|@;0*lov{$ycfV3^FH z!vF-JFk#^M$DqzBV-YaPv6)3!YmQ21zzlJ&xE4i~%!N*#1yNTVuW$s+VlU8&64B7? z6LTv+6`;8I*ts4HC0(hef)hPcW}B~FkeQINM8&Z9+5;J@Hn$lwI8~3HFiz7rr|FWU zpsL}?I8V)MQ(A7(=FX=2m8`LI3LhPA7f^KV($Ktgm^ETjLQcrZiOueJH`zHfRBB(C z&@83J#GW=$xut2I-A@Gp!$luEg;fMTJd7^zX62t@TeD$9YmuXspi#gHho~l*^UUJ1 zGaMFvWnpP{Q~RrYxFJ`fIzZee!yr)cuFCI`lP4Ur^jvF ZMK{HFb0|!34JetkXCq6uyrckwH2_Ob_F@14 diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png index 56c8137dcfdb48ddd2db348bbbfb6c8e1b8664c1..0c4a92400d0bb454a1f32a54b0ae0bf6a782a960 100644 GIT binary patch delta 10 RcmaFJKAnAn^2Xc}W&jrf1J3{e delta 83 zcmbQv{*ZlwvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6y+F#`aUwHT!U diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif index abd2a869931798d4eddeca7ba8a6acbb933da19e..3177355fe8a5e46fce327ebba5b1484af2584de9 100644 GIT binary patch delta 740 zcmVofXod7uBT~=b;Seq!0h11OKA~|D^-}rUn102mhl8|D_B6rw;$B2>+`H|EvrD zuM7XP4*#{n#~=O09{(Ix-WC;rzd|Jp78-7o&cGX2pv z`P(u4+%f+S)j0aoKL6n}=eI-sx#_{2}=S0RRAi04x9i000*N7XUyA{{R6A97ynw!9N5O3KUbKh{Ga0007v* zLZS&3Do%_MQ-)xk3LQ$6;J{&k!~q#HV7MT{LY{cMd%%$z=b?wp~5Ll4-Y zIGAKXB4tUEoJ8^-Q9|Sm92`Rbfann<2oNAd2oM1BgMfh@PfM(*141Yr2`W&iXnMjy zfB+4mZb-RB1Ra=YC`{0xA%zkpB_>FCAi;mk+pxHE7qnx>N(d2F%-FeIP|XK0a>#Ij z0>z7)J#j#&xvj^-mnaH^I7#A=$de%qrtpygp@(3d3{8w2F=9kPg2D(8Bvs*JPYydn ztEebkn1sX;BS_?dQzu}-Mpb|a)`Jf|0CCh3N-XtS3LLEImB&;Wr1 W5?sLK0}s%E2XP7=bP#R<0RTH$I9ojc literal 1207 zcmd7R>rYb$7zXg8EwrT|P@qTK3I)nVid7URP8mWcg2tv}gyFKqYgsdw%?##DVp7}9f|)&F8oetGhKe7`(f(^C^R z>>&w~n7d1y*-f0;Ll|p9}1-;@_zb zdRRja)sxN|Z)cq^bc<2D7&-=O8K`$R3-wH#_dtW2CmKD_=n1_W3r#H4vQf`LJr@m2 z(8NZw8;90=;Q|K+cXMIjqQwg>TwLU$)f=roxa0%l612Jb!sI(`Afe}>iA0ltZWf?f zNEwz-Us^V86il0h&rBk;`=P@hm)&@CW)ht|bOzu`0L*TIumr*!1WORE2Eocl7m02X z9m2V8A-b2sy4-0Eb9RN(#!%W6icT?Qj78g8nBr+m94zmkJpmo>!m4|Dj9bCD9pdbXczG*|vW3DXM!#Dq z?uOxBIPOYt-z^dY5d#Fjm79nJX(n{8OCLJyo$cQhI+7mek{&49tV2@ zh7#TkzK5x`&dYMjoDAy@SQY3}PFdCTjcwHM`+wfdboDCf$Dg=tUtnzC!l=qMl8cdi z3?8LN3Mj{63>4yl1`mrd_&r98VLySPA2D3!n)sET_+?@0IG&claSoF;aOhlr>+!q= zjy61PcRlOCv>AVO;^iP-+VSdlyc%`QJi_c_{4;?$2j-o4^9Se!&@RvvKm#EDmkFI` zE+U9~MC{w|-fn_m(?m5#l%}jqRxtx&^3Go%r8^RjsP_(Wr><#iMJG5P#*l0FcYXXR zFW`Vf8~|#a%|lzQk;sOl1KwmR2wHItJgN% z*D!LQh|&sEPxyyt9(s{bEm%^u;j4-GjMtGRVOtbmj%j%Z*2{OK7O^g8Y%2L_AoX)K zE5K&z$z0d;b5cQRqU8`jNA>}~al8CfvSh8xXbefwq)m|D>oAx F{{vqsHtzrc diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png index cbbb106a1970d7249505be4f3ee98c0154a48a7b..abc4e2d0fd657fdb681356a836a798f6b97255c8 100644 GIT binary patch delta 10 RcmZ3(`G{kJ^2S_y762Ca1GE4D delta 83 zcmaFFv4(SkvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6x#vH$>_${30O diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.gif index de7f1ef1e18b5a0abb29d314d52987d981754389..fdcf5c33e3973c6fd0bf87b615ba4bbdc3b7e38b 100644 GIT binary patch delta 749 zcmVM@dFFIbjz77XbGF0GD6@mtg>*Xab~d1Ey~TuYV1@e+R#R2DN+$ z(~k(wk__IR4a=Go%bXU^pBLht3;&}6|D^-}qX++|2LGr9|EdT7r3?S34)UxI|EdW8 ztPB6J4F9nW|FaMOv=88-5ag^E|EUuHsu%yN8vm;s{jD8;=Cm8;w;lht5&yUo|GE_a zy%ztr8~3{y|Gyajy&e9tA^x->{jx0ovors+H2%9W|GPH-wK)H}J^j5u_re|b#2){^ z82`f>|HK>p!yNy`9RJ83|H&Ws$RYj6ApgoB|IQ=-$tC~KCjZbR|I;S_(@%_(e68&?-hL}5o1o2T* z<;I_|L~lgNqH{@u21bf7VBn*N3psRd3?($82aq5@iU5HE1?iI~PEmAtp=ZQUJQG$l zJwd?00t^@y92fvXgN7|5^2l6cp@M1C6=Fw#AR!H0vAA;=+>_=Ci4s@R?73aAO^7gd z%ygMD1@k ftU(+hearyC1QTRH!E6xB& zqD@2?D2H5y0+xc%g4{<1GATcfUh_U_3i-@o7);*IgN?_{Q{67!{m zl(26Q)oP+TpJ*(gH=d#2`hwB=6|+Yxv}ie_T6VvNJ5a)VaG87ms^D?GaK2VDU+cL* zwa#n4-fQWmbn7SnPCXw@bTre^#6U9xEmS#ZVWO3VHVPZ=|WyCi&BT-@Q8u^ouayjyn_&42q#062nZ9z~YHvPmFls zt`wtE49M*kZ;X0lMBy}&P7{eirNbD3zBrinJ1sG=B%oh~fj41Eg86O7NHT_#?Gp<7 zlpn^tF;4Np1Vx5P8K&fpNncQ=eKD)RtRLq5VBKe*(~^!krNc_%o)YsE5(}hbF#wDH zxE}y(5EcWmLDua@gFXz2le+VIaK{QVgA9oTpA z@+n^Z4(Dq)|Ao^5I05JyX~kOdC6h)FHX?$c_WyGTu9N8F`DXOiju$e;;S0xvHHMtS zm6gVF!S+Py`t>V5yA>OzGuAIl{U;ZiCJN2xO|sxOK5RSMsYw(k9IDQ&G@JjbDE=|0 zIlYX%O)>?WHOCM1#iWhjlLTf|iWIUn&gD8)djl{3Sk;kMZEmvs@DC~LrDdI;maqa& zu6hfyzIP>8#mX^Rd~shvhjH5GbBb{~zDAapNe~%T1hIAUx%lIr0$x|J-sOh=8@5mM z^690$#N1o^$?5kb6NPCzYvUiZy{|ZOeP?Q@D6B}Q`0SD}vEF>?x$2|cX9oW#R$XvH z@3YOtvw32hcG=cTo*3r2`KhMbV(NmphAZ))f~zl8RN z^X?%Ly6pHtjk-*jwDE1)x#%k8E=Rs~RgyMXmymK$>#$~=XG=d<&tKGqF=kl%G!1la j$_e5^>>;mHg2*OG&Uc|EiTKGuj-qI#TJ0eb5pVqmPdofk diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/regular_smile.png index 786b20006f42330cd7458580324b7b4b618498ae..0f2649b78af3e4e11df8026e70531a9e0c81b117 100644 GIT binary patch delta 10 RcmZqU+`}*Xab>W0;FmJuYV1-c?Gt72D^m} z%!~=ok_^+63(J}m%bgbFn+e{p8~>sL|Dyx{qX++|2LGxD|D_54rw;$C3ID7K|E~-G zuMGOJ4*#+a|FaMOv=8T|5azBI|EUuHsv7^R8~v>v=CT@p=C>XHw-W!l6Z^Ur|GO3c zzZd_u8~3{y|Gyajy&d4UA>z6s{p!yNy{9{&YY|J*PB#4`QSH~-W) z|GiEBzEJ*?`T;hRGXg??_TB&YC6gd7Dk@xCUxaoQ9F0I6r5qU;D?k?{ z7IleyWHM-7N=Zpbk3mIic{XK;f_zRVJ;psQE-Nc4C?_W#r8QQ6PQkEnU``?;PGE3* zim-P$Hd=3bdURqsICs{CH%n1SxD5@D3=GCDYHT;bd_?pBLXe;mCB_amJJErK91+3b zOwgp_0|5jNjvRS_V1NTuQ$)al6{Z3OR2VQ^puiG>gfQ>I$(#vmPM9YnMmz~KCnl^i zA+osfQl&|gD{1h5v=ISJ(H#p|q};-lYY4#}RPum z%Ao_ypglA=pg^GjhLR!5fFy~r00W5`H^3DdGr?3Tlo%)*Oqc*+jL*PzXhhhpJ3<5q OH0u0Tbm-8`Kma>ls4WKo literal 1199 zcmc)J{ZrEg00!{yUKosRh`em$Wx#lmM2Hi`R#`GcJPmBn;b|v#Be1iAJFTvWumB;B z3zbCjnpQFxIEc6L+6L$laWFu}c$*2wo6uFK$(1{0-|y4czoO?p_x$?&^c*~tD0?+S zM2HCc9C1ZST*)A+Pcf@MVAg)ftjl4wd@bnw!l^5t(_73ll<-H(x%V#d$14TaN}gHe zWmb8cuL;dR3Rkak7h3!lTK%DBqJ{}I3pFfg=yryNjXEdP(>S={gc}@aY0hYHMvV(J zTxfWxcSEBK8o89#6~A!NL^lsjJT$wanTHk{|9P7mTKQ-dpiKas8`^1G(6ME`&V8*} z1g!@eL}>7(8hz2|M>a{;biQjHerw$lbh@K!E4pbO=<&p_p3r-4>V?pI!QhQvnhnt`%$n(<3Tj$qp86d((($XWSEwbdO7-%(RT#>3To&uIg>!m$sI-otm)MJ3CBn_ ze#_jnopj88g4tYH&r-8rk;~cSN**Q(U@63839O~Cm0+q2(-$yv(XsF|weZvC(mAYN z#EJ?JuVS$pD{9AITKv(Bm3FLlIv#dmO^-i&@YssSQ+P6mCpJ8t$G;1(FT=iqXX|+W zJE%=i4p1aO0U-X5NT0D81Ysj0UyQ%_1mQvv?OcD^-zwurY|n_%&jiPtQsRrt8%p>~ z14W}F(lzLaarodEaQpvygQQ#WvL{ zVNTLm@u;FTX4<;`w*2!)Cb_r3WmnOx>2$=jsh-V^3*1`~;%shFW*zo@$8sp8Ch;tj zeXJ(&QB{OOCwnV1J18owxWFTZNf29uOTJVVGM#1`k270J8gvIMPR4WiabroPZ62w; z@zP#S!jUPfYWH`^0!^8RG>g{)F> zn%ZenRroO1JDl(C;(l7mIKL*FIA2>G+dAhwq{www#AR55U0pdz6~<++iuYLBLZhXY z%ZgIDeEdLiIeUrV?a!BUV%brdOt*r0Mu6KtX=h4Z_g}xB6hFJTVJ!C21qE{h^OcO3 z_Z&F-EjM%`TtUXo{qs&qSm-%EV8RC&SQ^wAYVkX4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6yAu>b&=Kp1rZ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/shades_smile.gif index 11fc90f60ab0f0d60777af536bc5e6f2e8f89c61..7d93474c32aa7d066bde566fdd746483f5dd0aea 100644 GIT binary patch delta 1026 zcmcb_d7jh3-P6s&GEtmCoZ&kIgOP=~rM0P@y_uz*g`K^HwY{yigN41brGt~Xv#YtQ ziRmHwYp z{eMyQ|7G>b9~fn19~k|AZ2JG1d0#`!l(x_*ZDCV-BIis>o$* z|J~*If3M&FeE}yoq@LW8abj!Mi5)p7cjcVeSMcXxz{`ul|L(?|JW_h{Xz9u0&5@CSNwgH^Y?Mp|BH>2w=wD0U-|#>#{X}3|9^k<|JRHE|9=1f_lJRw zpq`F)pC$|= zDFFcvrUuid$b0n3yxio}>M5$X=f{JCM><6!SyNkunoeF>=27qL6s z?FyfhC0t@_Lg(=WX4XHI)?J~t$Yi1A=IK0=dZ`|J*Q{c?Vk*L<{OyfkqJ!ssRVIfO z_JI#L!~8gy1Q$8C2PiNwN+cYRZ~ma}p~zCAbRj^z<^qT6WD_AKwuqR*M)ocrB~K-V z6ayBYO$w7*q;(t)IB;iov>g%6owCD$J11h&OotT@CLHPYI3RFD(9QA74rT%S3*Sx% z$nYNN;s+oMXOsqNVx4~SJCRsYgrN$>%O9(>4bo@%p^{& KjWQwv4AuY_`()?< delta 1068 zcmV+{1k?M^3DOBzM@dFFIbjz77XbJE05Ui?IXg8wJ~lo-G(JBzIX*Z(KR7!-Jv%@+ zJU}@=LpeY~H$g);K}0u0MK?u6Hbh1?PfIjUO*KJ9I6_4@MMgS9MLbbWG*M19kw7g2 zV_`^+!C|D_A|tPTIF2>+`H|Emf9 zsS5wB3IDAM|E&xEt_uII3;(YR|F8`Iu?_#S4*yNF4*#?d;-e7ksSy9E691|f|Ee1P zs~Z2S8~v>v|FsbRwh{lg692do|F{$XxfB1o6#u&w|GO6dycPew7XQ8$|GyXHyC& z|Kc_O<2C>0H;#Z@l!jH5hE|k|S(J=foRVXom|&lqVVRm_nVMypn`NMzVy2&Hp_*@^ zp=P3@laB!mVQjmyZK9-e{klQ_y-okUPXE48$*^U~v}nk+YRI^3$+~RGyKTt6aQwkg z>CsdE-CW7Ub;-qb$;Wrd#(2obc*w|j$jEv8&Sd}FWBk{1|JQi^;%xondjHUX|IvZ} z(uI@c0WW{k|L@fQ@!0?I+5h(4|M%km`RD)o=>Puv|Ni{{{{8>|{{R2~0000X`2+y~ z0RI3i000007XTLk00{m7{|OvOu%N+%1otW2hY;aDc;k?rIfHB*JcbSb?V}e6P`7sZ z^2H-pED$}62KSvC!;RfHX{l0eOJ{Fg8FMHH?lXU<2c5T2oH%K+WQh?bb@vA0EJ&}% ziwYDxJQ8YY(j5&CEXeRdFJT`8EOO;qfxu4HI|NdQg>irn%6A!BWZUH{n~M!PbaZG@ zt=FzEli~$dpmWG2OVMPewK_q)O_$|bO}9oX#bzD?1cc;fz$uc@1Tu?2Nt-RX2#Mxgo0W3jPrv7V z&(VX*W^MiP-QM?kzrWA(Jip)b{9c!?{y$v)FAezt@DN3dvVTS8q8_`-?PKbj$G?V4 zP%N6Qm-BV-<6BU_1WLROsb@8&zA2A*?+Px)v7$V#oQ6a5z#0G@nQ);D{ua))KIpH3 z(*pk@#PBGuijmkM;RaYc$ElrAB3oopmX*4d1cMo4#+v_wq6_5~RSwQcMRto7Sy_hMTZhR%5M5XUCS6 zx~vsxSby?TnQJx?800T2_9H0NjAh?TSWDO5^p&i}^67f!hX$fpis^ut^W|c~Bh7r0 zyNagzSJ?A@k}mbUH#d>MU^9O;Ji@iZ-h_#7??(wV)ui3@Rj*~=?hHaA1THMabijKk zp2X%2CK3{&Xtt))d~B1Ux-^oKqIvCA$z|gtXn%On@VyvGb5$zMM>o=ZM07BPq(t$p z3qr9Ja}fN}@mbn}r~sBP4=3l{cyiv0XGMGjVGB%LXptj%_yPE8B9~fx(0y^C+Xlz zaqzj9F;T}%=(PJzK839@7+YN!I?Jh`(R5Wpp_>75$U2_34?Vb8J)v7^r6{BK@YPt3aq-qp! zxeY3PB~VsW;A#}R$W3Fvt498CW85;#@F=f}k=VQa%`KC{^y`&ZM@yYubvcyOvl>(1 zlt;Y(zZ}FyzlWtJGKFfpFGJwPjb%5?|I($oacYU zz5ZeTuaPp9JzD71NpPpbvWj5G3GL`2_1V>Gak)K+p>$kN#o4-Mgo5n&qy*Xk?ES%tyE7d_ zq~WTnVe6AeRKeSLtbrA??are;P-cQ5FgB081 zU>NiUB!6q_9h8>ZsHt%Rf|fsrXusj5;msJu>l%Fs(=3k`3YvEA+_{9FQ=4~v`4g7n zVm56oXCx58EG5gHFTvM0N^@HTr5oJzm^ggaLRLW$n>Nm4WFU&!Bw4n!2%i?^QhSKy zuIU!6GtLJ`qMZ_O;dkTqSXf+J%y3@_-`#|U`+q{zRu|E9ErmTtviRg^7ME_Ov$$qD z!#%vNw=G6a zl9md3I7(Kg9N#z1gc^xsG67mEV-1&p``y%3D1K}5AatE_mxFSb0}+qY_`8?Im0*@} zQh$X(ZH3}ob2lO$r@Yce`9d2a7UO(#2TxbXvC6B)4z!!2#nS^%9C^Nhe(;_(L%xT_8+`{f|D-DPBV~Fq7-CXz?lzesgu2QGzz!6VIYW75|v^%4|BFpGA=oxo-LGZ>tfz+ z2*xDg2L6{_*=OzNZjKw6))EiDQ|hS&@lH8L8gKy t6XXKV0t#@ofMA002ovPDHLkV1iHkXA1xT diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gif index a950b4389a36246e917ce746167101a5a4f8e0d5..44c3799690ede200f70487c344508416bcae2a97 100644 GIT binary patch delta 823 zcmV-71IYZk39$)YM@dFFIbjz77XbGF0GD6@uYV2JiUZe;1lW%R*pCI>k_FzB1>BVf z*^>y|m%F zu?>-t6@UM$8~v>v=Cm8;w;k!T8SK3u_qG)HwiExh5&yaq|GE|bycPep8~3{y{=FIh zy&c<`C)}JZ-Jv-Cv?2evApNo||FkszyD|T}HvhFa|F$~)y+8lFKlj2N_rxCm!WsX> z8~wu^|HT~t$R6>>CHKf7|H>f$%pw2DCI8PR|2xqo|I;S<(<=YgDgM_h|Jp78*)RXy zFaE?b{n0o7)j0p*GyS?j|GiG*uU6x+S>&@`|GrS>x^4c(N|XEnE0Zb$Cs5^^@YbmR z;GzHHqWtWs|LU&)p`2+y~0G0qO z000007XTLkKnVW;EeRYru#&+_1QQB$qhd*tha~_2AVET62N*3@s7d37;Gzl}h9t0a z@E{isFh*ENl(5pA8hO@8dD4W5!y-!dJn}IIp}wL%WhfdO&1X&y1Xd_yCt0uXa2AmW5r4tJ&yc<=&6vA1v7tOp3rRa5J_PnVjh8D zL{JchDod6yjyWO`$PbAx^u}=HL(tDGEs)4ZvLrwNBt+~FVbS;to~f1q76cIl4iSV9 zd8Kec0|yAufCety5!pf-zz~E1GjLJIA(NDZhyoe(fJH|FQG$a8ESTU$W(Umx#0WR+ z;8j6#NT7lf31}yANFy#=@k4iW?r#T8dP!2$$0BvPb8EXo!T06RVo Bn5h5& delta 1050 zcmWmC`A?Gv0LJmRh0@lda+T6@wcH{o17y{)K*5PHWw^NwoDwiPaYu9}OK@8(GBifw z!LccZjZ0vFT%{CODAJ1D6_Iku4O$Ud5Cj4iH#cTZE+frY}Tdc4^nH9=;C>Kx_0#w+Om5zFuKrgq~ zH#oki<1eV34GNo8g*D_BsJDQ^5)DRH_}dyvBQBb_P}!oH2Zg<%(T-B_anBAa$I%?m z(OjRgT;FkNftZqsD7grCg`~^}bpenEQjPDSF$ncyD0ZPS7|IVxRS23w3>wE}jkBTE z2`zR|8}XsxQ)&T>Gy>cgpw*td?|=smXm>=r6FQvG>AckLzTPG@bco0fA=xQHmk`}T z^oU5UE3{G?5(VGG^gn0>3h&C@$&Ap3V*l#P0W9jUG>oMY z{5Ou32^eNzn8n)j^_BUzhJWy8j$Hc})H+4I#XBTG0m$m3MN36%rZj@k6F!7-?^+{R z6rp81h_B~L&X`(z2S!xIRmKD+rIinuPis;KQt*G?$KV$?4f$93rJ_X@szcr;L2)uhzSdgdPe>340(hv~5&w z%eLXa?&A8Me=6qIhL1dSrqLH_)J+#Vt~(d~@&HV zTQdEdp}JGd&X0ahDNHYEr)Qk?3TthVFTXfjADS3tCObbBTR^wmc`0>L@=4kO6K-5e zxWx{anwmW(O%ALmPLwV*HISY0D~B24@Ho`7_jJG3FDAH##S}~(wLYdu%TIOP6?~eY z@ml@*SWFk)>!T7~tXlo;%>)_Ck{>J5UUPH_=Xm;ew6J|U#K{?vt4GS7{Z40?5+D2z Dg) diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.png index c7d2fd4e74a49358a42cfbf5640ee0951cff5f40..5e63785e42152e16329c5156f444b06f411f1c00 100644 GIT binary patch delta 10 RcmaFKIiGWa^2Xd6762E*1MC0* delta 83 zcmbQw`I2*jvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6znu>b&@Dj325 diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gif index c01f763fca94c4bea3cb1c8d808d78eac24e8fa8..5c8bee300d7fa70e68e5219a92da9f1bd3933f43 100644 GIT binary patch delta 566 zcmV-60?GZ|2+IXzM@dFFIbjz77XbDE0Ks?z!+8V2c?80H2*Z5~#(fIKehkHc55|BI z$%Pfig&fO=8Oewu%8Mq;jVsWOBh-{F&5<$ImoeCzH_(_r+MPMupFPx}Pt~MV)~8z6 zsb1ixNaLzak$)mh!f*7$bM(Y>^u%=Z#dP(?c=gDAr>Lc>sGzE-p{%W{;=qaH!;bdK zfcDFS^U8(x%!K#OhxgBl_|S~x#gpdAn&-=%_|lR2)06qtmy<97B{JXM@ZQ1Q;M?)w z#`5CI^X1OshA9B`t<7i_wV@l`2YX^lc51)eB29t&l7!e=RsTt|$vLr@6bXER?}HuM#w0UNT)gb%|l1LyAZf1b71= zzyO6R$^=PC;0nOFh!`V&`s8n;$3p+C=&}MML4^(_M#)O?;lL9@shTuFXRihb0GR?r zNS2BU6`Cx3<=FAc1OYDo6luuFdLM@dFFIbjz77XbHy0Ks?z!+8V2c?83H1j2g=!+i_IdWyyKiZu++n+tupib1GPt~MV)~8z6sb1ixNaLza<*ibYWFmjSZSlcw^1*KM!f*4! zaP-4-^u%-Y#B}t1c#&-3_c=gA6^~ihm$b9w4efG(H_Q`*zsHLi?psJ{$ ztgWizz=`9-j`qrc_RE6y%Y*aEh4##Z_sxa(%!c>Phxg8h_s)s;&x-fZi}=ut_|T2` z(vRfDljg~q=gSbC_|lR2)06qsmHE||`PQ0|(+I_6?CS3B?E3WT`}gno`1t?+{{R2~lQ98YlRyDY zlRyDYlRyDYlRyD9em0HC9Q32FpEJc6fBA3Q}Ia4_M5#*H31Y@kr^1|pF@Yu5B3a-*lu zATV#7c;E-&O*U+H`s|rQNeTb~qFxZm@MfGiN}1Z|;lznge;N>wh!k|wj-9MGa^wgi z#mdqb1^!g+lSdC)96gj+=|bZ`)Bp$O%G4wCHKWf)hu$zAs9#TT qjsu?n=F=A_D1wR`Dny{)euHeW00s+eLEu4x)R9FU11`8=Kma?nU3aYj diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.png index a6bb53291bb928d3893e8e3ea9509f6233cd090d..1823481f2f05404a08fcc9357ec930911ff28ca8 100644 GIT binary patch delta 10 RcmZ3?ag%+5^2Xe4%m5cM1Qq}Q delta 83 zcmcb~zL;ZzvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6z%B<2+9S2M@dFFIbjz77XbDE0Ks?z!+8V2c?80H2*rL3#C{LOfDgxk5y*rU z$AuirhZ)IWyyKiZu++n+tupib4KRo16k*Qs9M zr%25SiTBTn_t1;@(2eB9 zljg~q=gXb=(vkVpmHE||`q!J2HUS?F-`?=v!QJ56@!-bt;>we30VM+e|C6BsV}Bv} z1OWg5UjQrs0000N02cs22mgRyf`f#GhJ#cS1ptfy0um=Ek{kptU0z;YFkW9?F$yLr zCnq&EDv^>XEm}`cS}mN0UI3{GQHO&v5veFPLqIqzDXFVk#;}B5N(=&x0}U1-QB5!{ zEig^7hCT-o2R^vrUKkpZCJ02B>VKG>7aP1oM?yb0EX2mgoKXY-0RaRifastx?A{eC zue5DRz(G=q6(hU0z zhyzflS;K}2LE69m~4iSf$7{P%80vA<`RoN6%=DJQY IzXSpRJJY2J(f|Me delta 685 zcmV;e0#g0T1=t9GM@dFFIbjz77XbHy0Ks?z!+8V2c?83H1j2g=!+i_IdWyyKiZu++n+tupib1GPt~MV)~8z6sb1ixNaLza<*iaz<*riYuT9kzf zs$k!`f9tnk?6+a5Shxg8j_s@#= z(2MxcjQG%v_|lK$#gpdAn&-=%_|lR2)06qsmHE||`PQ2H*PHs+osrfb7vA09-`?=v z!QJ56-Qe5t;KuUe%JSpPlLG-I1^)j3|NoOQ0bG+n0Zo%Y0Zo%Y0Zo%Y0W^Oh`2+y~ z0D}N5000007XTLk00{m72MHWVu%N+%0|nK|Qb!QNhl92-z`$S&#Djt)sJNjbg2Rgh z1p&B0vcVjXAs@gX$w95~<_HlYN8C8PvmpV1 zrvLLZR;=z2Dwkhc$som?_#%u%2bf+Bg~a2K5S6Ep>_`+#)IY{ z000<)3@=p>%T=o<59&V%UdXM2S1##3cI==Qgam>N9-^H%2|c?H95_v=2MM|mI6w*| z$eXia6Mc}M2PH^0@&IBZvEnsrx(|Az07ZGUGF+74(4YvOwRpIOR3kwER00%uz``6w T9hKBe0`bI?bPJ*cQ9uAYn%PvT diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png index 6ea7859189062003ba744c545852fae41207ee22..d4e8b22a3cc95d0d6e7e2de697e9e7fe910ce9ff 100644 GIT binary patch delta 10 RcmeC=*v~#ed1LMzW&jl`1IPdX delta 83 zcmdnb-pMgR*@J1r3?S34)UxI{;3N8tPB6I4F9kV|FjR} ztQY^O691|i|EnAQtsUmH8|Jqi|F;qUxfB1p75~2%|F#?VyBPnz8UMW<{<0zdv?24b zD*du7|Fbjyv^4&^G5@y+8ND9rwf@|HK>p!yNy|9skE3|HvNq$RYpA zApg!I|H&o)&nExSB>&SU|I;V`)+qYgFaO&w|J*PB#4`QSH~ZT#|J6AE<~RMiL6h(S zHT_B$S0kkRURSzF4ZU1q%`+M(6;8MQF@CX|SL`fh7$df2#_I`r)yI z%pF03_N=+W!w=Y@Jfv*N*+hZ_Bu64dP&$VW521uk1Q|k@a1YC#27nhzEr6aM$Vr)e<$47_Txbe7bi}bEOB_G$WbqWPWYE0m?y*(B}$eUL4W|r z5B4!+yqNK)hn}HWUKHtG1j&L0MG*0y5E`+d1sqis5||8x9p&Is89Bwm2r#^Xf>3FU zAm0lQP!OSn6F4wJ2tHil(NH;v&_WABP+?MJ3pXd#sB~S delta 984 zcmWmC>rYb$0LJ0d($aRPKq>S}3oX!sjt(R+U}FI)A`Ens!GhBdIKl_XmXJ6TLfjY( z7jMhJ8fB;pw314>$^B;K>Hq=dQYPTos6bh!i-SZvk)C&FZ=Ux*`1SDyd4UJhQexvy zNC*kxd`xu5^QH*m@jm{hO7&c;?M&pEK5?rI(3Dh*CU1x*Z;Ds1lTUAwQ@0e4Zu`T? zgoz2G8%#6~>R2$dVRpxDchqxW;lRX29S?OR%%0ngUa)Y{z@zHlLL-SL63rx9XnfqE zd7#w;ZJubSd7;B=)hJkRlsK9t+f4%0pAf<#fkjR=$kE{EYEnAd1xY{+Y za!si5K!r&arqr(KAWR41VGt%Xm=4Axniey`nAKp8ro}uh1hxG;#NY`x4nzu3 zwH9l}-RJfAs~KzUSnu53=z^mU&wB7;9xrUzTEx~8UajEe?{Geaa}BRIvGXUWH=uSw zxc~})p_WlpqJGU{5X2%8M$r4e5rRt*tvp3)MRigE%V+Os%HKJgKV|tRy@OK9Sa#X^vnA>A zm{#5XR*TJa@S>+oXyg2-h%?u?az3rd(3WH-$d1$`W|x&WWSwCI<+bIIhrZ`4=M1VL zdGzU~+*)JZ(ocDA`SvQgEtSbiKBr2o`R;*_w&nPQFjeO(iqGESem+P%Qa(K8A0q2~ z+gD$Zu)cWIx^r0*mlbxjcsn>vsJs8o4XQN%<-#9XWfu=enl3b}%m*~R7uZdO+LDaR ztAqRYXY8G4=1(uCvxnJZGhhCEtSG|7uKvit7LxXV&sVZN0&k^y50x^Ny3eYFdVXG& zbY{9W&7DvbCNiYSdNz6NjQ1~5tUafgo?ROI1i=zSd>f*x7%UTngc=0V-Q^J@=dW@F zi3Br8&*TLZ7N%$NS2CGA-Qv6UvjnrK^Z-{;^fCFv6^)xaCpcH_CsGs=DUr$ItV?0F YEbrvdHi6HEo}>I~_FAscS3tb~AFMj?*8l(j diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.png index 5bee4c049e62a165432a5ea7b8457202aeefa8bb..56553fbe115199b50ad06acb77c781dbe0cc4561 100644 GIT binary patch delta 10 RcmdnS`G#YH^2S_G762E&1JVEh delta 83 zcmaFEv5j+rvIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6ygvj702Mi{67 diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.gif index 369b43508217c8045bd03478a212069579ed8fab..81e05b0f6adccdc330a951fbc4f7f109da3d2ebc 100644 GIT binary patch delta 758 zcmV1r3?S34)UxI{;3N8tPB6I4F9kV|FjR} ztQY^O691|i|EnAQtsUmH8|Jqi|F;qUxfB1p75~2%|F#?VyBPnz8UMW<{<0zdv?24b zD*du7|Fbjyv^4&^G5@y+8ND9rwf@|HK>p!yNy|9skE3|HvNq$RYpA zApg!I|H&o)&nExSB>&SU|I;V`)+qYgFaO&w|J*PB#4`QSH~ZT#|J6AE<~RMiL6h(S zHT_B$S0kkRURSzF4ZU1q%`+M(6;8MQF@CX|SL`fh7$df2#_I`r)yI z%pF03_N=+W!w=Y@Jfv*N*+hZ_Bu64dP&$VW521uk1Q|k@a1YC#27nhzEr6aM$Vr)e<$47_Txbe7bi}bEOB_G$WbqWPWYE0m?y*(B}$eUL4W|r z5B4!+yqNK)hn}HWUKHtG1j&L0MG*0y5E`+d1sqis5||8x9p&Is89Bwm2r#^Xf>3FU zAm0lQP!OSn6F4wJ2tHil(NH;v&_WABP+?MJ3pXd#sB~S delta 984 zcmWmC>rYb$0LJ0d($aRPKq>S}3oX!sjt(R+U}FI)A`Ens!GhBdIKl_XmXJ6TLfjY( z7jMhJ8fB;pw314>$^B;K>Hq=dQYPTos6bh!i-SZvk)C&FZ=Ux*`1SDyd4UJhQexvy zNC*kxd`xu5^QH*m@jm{hO7&c;?M&pEK5?rI(3Dh*CU1x*Z;Ds1lTUAwQ@0e4Zu`T? zgoz2G8%#6~>R2$dVRpxDchqxW;lRX29S?OR%%0ngUa)Y{z@zHlLL-SL63rx9XnfqE zd7#w;ZJubSd7;B=)hJkRlsK9t+f4%0pAf<#fkjR=$kE{EYEnAd1xY{+Y za!si5K!r&arqr(KAWR41VGt%Xm=4Axniey`nAKp8ro}uh1hxG;#NY`x4nzu3 zwH9l}-RJfAs~KzUSnu53=z^mU&wB7;9xrUzTEx~8UajEe?{Geaa}BRIvGXUWH=uSw zxc~})p_WlpqJGU{5X2%8M$r4e5rRt*tvp3)MRigE%V+Os%HKJgKV|tRy@OK9Sa#X^vnA>A zm{#5XR*TJa@S>+oXyg2-h%?u?az3rd(3WH-$d1$`W|x&WWSwCI<+bIIhrZ`4=M1VL zdGzU~+*)JZ(ocDA`SvQgEtSbiKBr2o`R;*_w&nPQFjeO(iqGESem+P%Qa(K8A0q2~ z+gD$Zu)cWIx^r0*mlbxjcsn>vsJs8o4XQN%<-#9XWfu=enl3b}%m*~R7uZdO+LDaR ztAqRYXY8G4=1(uCvxnJZGhhCEtSG|7uKvit7LxXV&sVZN0&k^y50x^Ny3eYFdVXG& zbY{9W&7DvbCNiYSdNz6NjQ1~5tUafgo?ROI1i=zSd>f*x7%UTngc=0V-Q^J@=dW@F zi3Br8&*TLZ7N%$NS2CGA-Qv6UvjnrK^Z-{;^fCFv6^)xaCpcH_CsGs=DUr$ItV?0F YEbrvdHi6HEo}>I~_FAscS3tb~AFMj?*8l(j diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif index 2cc81c14f6812119c710e01609a0b26fd77c43ac..eef4fc00ab286211a8e33bf5762d3424c8c4eff8 100644 GIT binary patch delta 618 zcmV-w0+s!y35N!3M@dFFIbjz77XbDE0GD6@mtg>^Yyhu+4ZeH>zJ3MEniR{O7XP9G z|Dyx{qX++|2LGxD|D_54rw;$C3ID7K|E~-GuMGdP4*#?d=B^k2sS^LH8vm;s{jDA5 zvKr>M9sjlw|G5+YyA}Vwk>MO#{<|^%yEgx|IRCaf{k=c`yg&EC9rwf@|G*gk!W#d> z8vVl@|HmHx$R78|A^*%F{mmo)%_9HFCI8PR|Ij4=)hPekE&tpv{=_o<(Kr9pIREB1 z{klQ_y-ky}0W<>Ag_H0BLk{-c|M%nn`sn}u`~Uy`lVJiReeUsXUpK0P`(HalW)DqM(yb4DC8$H$l-9vvMV9Hl8vM#8XXS4I~XMptKYim+}h zDpF=~acfyFe=Kg*g)2cxJ-7!4x&{WvB4J}I!gCj9*cdnv2#^^ve*DPv%tV?C!prYb$00r>dcWWtjP}*8r-cLsXT`irD2sJW=uE3a4vn6ZIa7Hn43G>57RxB_u znTvo4hK+4PfKr4~Ea-TRmh!CC^3aS$aWYah`!wCG!tOo0`xAEZJLfMrb=*#Y<(0Y>jL!BD@3mleOpeTPY4Gs4E;0_ zoFWW_;|6UjTw8;EGIU44E`wb`^(fF2P4=pS1B#$4I(SosK{1Bjz)e~NZbjm!NDR{? z7>UAY6vm_&m*MAza-{_>4K=a@BU%jVFti&ZdojF^9NUl4{UMJk|h`D6=lW>=ofh1HY=Vl7$DEc#wsMS(JAtxsZcp9q#E6%pr&KF!nCS zj16lV{=x+;)?%ryNzOQs_~!~lU#YF`PRZx*&wOIFuyaN7SI?6V+mDnMcs5M+#@5}ZnCw8~!OTXr{>pD2 z<{49$s$!LYhe1qSimo+F(w`qF?KCi})!R=@8;WyS++2S~e*IS48+xC&;`&_=H;pC{|=^p}NusY(|BS&m;eX?<{xm2y_ z@1GQ|?wir`Q%zNFp7vaBq267;^MdtJt60wuH~v_arak!bB3FJ&?%~B&*d|y%)EpD5 ti!|A8cDOcB#ViUa*Ai+S6$7(jZ)Ggby*d7&E0D+A*1g`yDoE)^0!@>^0!@>^0xo|c`2+y~0EGZ7000007XTLkKnVW;3ke)JkdQ$_1QQBG zbApJ&1woKFcu@iXfDSQMq#!fq3_(8?HgFjEV+oZgQjTQ6fI&nBKM4u3sR5@0$jS*HJ~|A5v7)Jp6emt>n2N)Tm7y{5ps^AngcW}@cm^qq`G-di zF?R$B;-jX@jz3rn>Tr_fNX{cihzw!C;D?VDa_H=`v-?mpFfb>V#-h{Er1NT5#rc2!yc@E`dP6j~ti>!xJM%NE8@=07wsu zE}G5K(;D=LNz0kV^bksm@JP{0o`K!wE{R~1s&VL!BB0#Zmh1=UC_xN+G+8LS|K z5(*fAf@D!mWf~7vpfS)OH*AnX3XjonfB*pmKtKbgjbMWgVihQ~h6GcIn1Kec%_ac^ ew~a+eA2&Q8!IBb0@W2B%^iiCV2N|SWKma@I%2JvD delta 983 zcmWmC2~U#;0LJmRP-$OVXaP%EX`z)%jsYv^m}sD=pd-X+h$+Ma2(S$oqtW3KS;`u+ zc_4v-awkx%KuZNnxj~^YZnWi4Kp^uNNOXx#Cn9T~y?gS@{}ViV@*b&(JrooERSKWr z6YEPvNitEALR6*GYQD2keNR`Pp*LM*XtJ113j4Nfh9R4I{~D(+&ta~F-Cy9?U(6dX z-!@*(dtS~oYdu!0*-+V_)&?qD)Y?K#l>s#!x3{2eBwYaV51#jB;Xyu~K5$zPGkL^5kIHS`UUCwam+J4n`ZKIQ$Hpo?y@YiW z)_-BO09F7+HM9(cWP?s4h-D&>p!WYs2&R?jC57Py6|ysQXaDy@y0V~zeZN#s&9a{w zmFAh!vKy}#c7D_Ibv2I6NFrouqKV4)c@RhGs^pYA4g3l<}LnpS3OpgWH?K{$nw7`mi?6DlyqVBq0;uE zVNc?3{&Rl0i^_@4^RXsT!}*o7=39PaMZOVzAuMIm&Q}4ksl$&>UmDF99m{!}@nhzp z*X|0s;ic|q_Lcls=_jjPO5mu$BdUZALvoa@N8HVW zQH3Y%wBj*#@uchS#a$Krt!!})VRx{=-7&SY&|YRLt{ylSu~d`?+;5R1>-UvI_;W#H=-S6pcni{0I9?{W|~v diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png index 805da9605880b395a2ab1495ec826dd0807cc215..7c99c3fc54c753dcfe19ff73e225733a2ad7261e 100644 GIT binary patch delta 10 RcmZ3&d5dF$^2S_q762Ak1DpT= delta 83 zcmcb`v4nGivIhf8v6E*A2N2Y7q;xPaFmM)lL>4nJ@LmUDMkkHg6+l7B64!{5;QX|b i^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq&6yAvH$>=niz5b diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt index 8a4ef1f6ea2..3ad20f5f7cc 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt @@ -1,4 +1,4 @@ -Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license cs.js Found: 118 Missing: 0 diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js new file mode 100644 index 00000000000..27bb9013bab --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js @@ -0,0 +1,13 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","af",{euro:"Euroteken",lsquo:"Linker enkelkwotasie",rsquo:"Regter enkelkwotasie",ldquo:"Linker dubbelkwotasie",rdquo:"Regter dubbelkwotasie",ndash:"Kortkoppelteken",mdash:"Langkoppelteken",iexcl:"Omgekeerdeuitroepteken",cent:"Centteken",pound:"Pondteken",curren:"Geldeenheidteken",yen:"Yenteken",brvbar:"Gebreekte balk",sect:"Afdeelingsteken",uml:"Deelteken",copy:"Kopieregteken",ordf:"Vroulikekenteken",laquo:"Linkgeoorienteerde aanhaalingsteken",not:"Verbodeteken", +reg:"Regestrasieteken",macr:"Lengteteken",deg:"Gradeteken",sup2:"Kwadraatteken",sup3:"Kubiekteken",acute:"Akuutaksentteken",micro:"Mikroteken",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent", +Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent", +Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke", +Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis", +aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth", +ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",uuml:"Latin small letter u with diaeresis", +yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Horizontal ellipsis", +trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js index feca2677411..8c3cc20235c 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص علي اليسار",rsquo:"علامة تنصيص علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash –",mdash:"Em dash —",iexcl:"علامة تعجب مقلوبة",cent:"رمز سنتيم",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين الياباني",brvbar:"خط عمودي مكسور",sect:"رمز الفصيلة",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", +CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص فردية علي اليسار",rsquo:"علامة تنصيص فردية علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash",mdash:"Em dash",iexcl:"علامة تعجب مقلوبة",cent:"رمز السنت",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين",brvbar:"شريط مقطوع",sect:"رمز القسم",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", not:"ليست علامة",reg:"علامة مسجّلة",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"علامة الإستفهام غير صحيحة",Agrave:"Latin capital letter A with grave accent", Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent", Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js index 0bf8749eabf..74cc149f6c6 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","bg",{euro:"Евро знак",lsquo:"Лява маркировка за цитат",rsquo:"Дясна маркировка за цитат",ldquo:"Лява двойна кавичка за цитат",rdquo:"Дясна двойна кавичка за цитат",ndash:"\\\\",mdash:"/",iexcl:"Обърната питанка",cent:"Знак за цент",pound:"Знак за паунд",curren:"Валутен знак",yen:"Знак за йена",brvbar:"Прекъсната линия",sect:"Знак за секция",uml:"Diaeresis",copy:"Знак за Copyright",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js index e6504372bf8..46dcb0ae0aa 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","ca",{euro:"Símbol d'euro",lsquo:"Signe de cometa simple esquerra",rsquo:"Signe de cometa simple dreta",ldquo:"Signe de cometa doble esquerra",rdquo:"Signe de cometa doble dreta",ndash:"Guió",mdash:"Guió baix",iexcl:"Signe d'exclamació inversa",cent:"Símbol de percentatge",pound:"Símbol de lliura",curren:"Símbol de moneda",yen:"Símbol de Yen",brvbar:"Barra trencada",sect:"Símbol de secció",uml:"Dièresi",copy:"Símbol de Copyright",ordf:"Indicador ordinal femení", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js index c2b38f0fc72..c8d129ef3b3 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","cs",{euro:"Znak eura",lsquo:"Počáteční uvozovka jednoduchá",rsquo:"Koncová uvozovka jednoduchá",ldquo:"Počáteční uvozovka dvojitá",rdquo:"Koncová uvozovka dvojitá",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrácený vykřičník",cent:"Znak centu",pound:"Znak libry",curren:"Znak měny",yen:"Znak jenu",brvbar:"Přerušená svislá čára",sect:"Znak oddílu",uml:"Přehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených uvozovek vlevo", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js index 77f59f61f9a..b873ac927ad 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","cy",{euro:"Arwydd yr Ewro",lsquo:"Dyfynnod chwith unigol",rsquo:"Dyfynnod dde unigol",ldquo:"Dyfynnod chwith dwbl",rdquo:"Dyfynnod dde dwbl",ndash:"Cysylltnod en",mdash:"Cysylltnod em",iexcl:"Ebychnod gwrthdro",cent:"Arwydd sent",pound:"Arwydd punt",curren:"Arwydd arian cyfred",yen:"Arwydd yen",brvbar:"Bar toriedig",sect:"Arwydd adran",uml:"Didolnod",copy:"Arwydd hawlfraint",ordf:"Dangosydd benywaidd",laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:"Arwydd Nid", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js new file mode 100644 index 00000000000..c1c6c3c207a --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js @@ -0,0 +1,11 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Kurs-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation", +reg:"Registreret varemærke tegn",macr:"Macron",deg:"Grad-tegn",sup2:"Superscript to",sup3:"Superscript tre",acute:"Prim-tegn",micro:"Mikro-tegn",para:"Pilcrow-tegn",middot:"Punkt-tegn",cedil:"Cedille",sup1:"Superscript et",ordm:"Maskulin ordinal indikator",raquo:"Højre dobbel citations-vinkel",frac14:"En fjerdedel",frac12:"En halv",frac34:"En tredjedel",iquest:"Omvendt udråbstegn",Agrave:"Stort A med accent grave",Aacute:"Stort A med accent aigu",Acirc:"Stort A med cirkumfleks",Atilde:"Stort A med tilde", +Auml:"Stort A med umlaut",Aring:"Stort Å",AElig:"Stort Æ",Ccedil:"Stort C med cedille",Egrave:"Stort E med accent grave",Eacute:"Stort E med accent aigu",Ecirc:"Stort E med cirkumfleks",Euml:"Stort E med umlaut",Igrave:"Stort I med accent grave",Iacute:"Stort I med accent aigu",Icirc:"Stort I med cirkumfleks",Iuml:"Stort I med umlaut",ETH:"Stort Ð (edd)",Ntilde:"Stort N med tilde",Ograve:"Stort O med accent grave",Oacute:"Stort O med accent aigu",Ocirc:"Stort O med cirkumfleks",Otilde:"Stort O med tilde", +Ouml:"Stort O med umlaut",times:"Gange-tegn",Oslash:"Stort Ø",Ugrave:"Stort U med accent grave",Uacute:"Stort U med accent aigu",Ucirc:"Stort U med cirkumfleks",Uuml:"Stort U med umlaut",Yacute:"Stort Y med accent aigu",THORN:"Stort Thorn",szlig:"Lille eszett",agrave:"Lille a med accent grave",aacute:"Lille a med accent aigu",acirc:"Lille a med cirkumfleks",atilde:"Lille a med tilde",auml:"Lille a med umlaut",aring:"Lilla å",aelig:"Lille æ",ccedil:"Lille c med cedille",egrave:"Lille e med accent grave", +eacute:"Lille e med accent aigu",ecirc:"Lille e med cirkumfleks",euml:"Lille e med umlaut",igrave:"Lille i med accent grave",iacute:"Lille i med accent aigu",icirc:"Lille i med cirkumfleks",iuml:"Lille i med umlaut",eth:"Lille ð (edd)",ntilde:"Lille n med tilde",ograve:"Lille o med accent grave",oacute:"Lille o med accent aigu",ocirc:"Lille o med cirkumfleks",otilde:"Lille o med tilde",ouml:"Lille o med umlaut",divide:"Divisions-tegn",oslash:"Lille ø",ugrave:"Lille u med accent grave",uacute:"Lille u med accent aigu", +ucirc:"Lille u med cirkumfleks",uuml:"Lille u med umlaut",yacute:"Lille y med accent aigu",thorn:"Lille thorn",yuml:"Lille y med umlaut",OElig:"Stort Æ",oelig:"Lille æ",372:"Stort W med cirkumfleks",374:"Stort Y med cirkumfleks",373:"Lille w med cirkumfleks",375:"Lille y med cirkumfleks",sbquo:"Lavt enkelt 9-komma citationstegn",8219:"Højt enkelt 9-komma citationstegn",bdquo:"Dobbelt 9-komma citationstegn",hellip:"Tre horizontale prikker",trade:"Varemærke-tegn",9658:"Sort højre pil",bull:"Punkt", +rarr:"Højre pil",rArr:"Højre dobbelt pil",hArr:"Venstre højre dobbelt pil",diams:"Sort diamant",asymp:"Næsten lig med"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js index 6b3ce87ec5c..84e86309042 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js @@ -1,13 +1,13 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"kleiner Strich",mdash:"mittlerer Strich",iexcl:"invertiertes Ausrufezeichen",cent:"Cent",pound:"Pfund",curren:"Währung",yen:"Yen",brvbar:"gestrichelte Linie",sect:"§ Zeichen",uml:"Diäresis",copy:"Copyright",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",not:"Not-Zeichen", -reg:"Registriert",macr:"Längezeichen",deg:"Grad",sup2:"Hoch 2",sup3:"Hoch 3",acute:"Akzentzeichen ",micro:"Micro",para:"Pilcrow-Zeichen",middot:"Mittelpunkt",cedil:"Cedilla",sup1:"Hoch 1",ordm:"Männliche Ordnungszahl Anzeige",raquo:"Nach rechts zeigenden Doppel-Winkel Anführungszeichen",frac14:"ein Viertel",frac12:"Hälfte",frac34:"Dreiviertel",iquest:"Umgekehrtes Fragezeichen",Agrave:"Lateinischer Buchstabe A mit AkzentGrave",Aacute:"Lateinischer Buchstabe A mit Akutakzent",Acirc:"Lateinischer Buchstabe A mit Zirkumflex", -Atilde:"Lateinischer Buchstabe A mit Tilde",Auml:"Lateinischer Buchstabe A mit Trema",Aring:"Lateinischer Buchstabe A mit Ring oben",AElig:"Lateinischer Buchstabe Æ",Ccedil:"Lateinischer Buchstabe C mit Cedille",Egrave:"Lateinischer Buchstabe E mit AkzentGrave",Eacute:"Lateinischer Buchstabe E mit Akutakzent",Ecirc:"Lateinischer Buchstabe E mit Zirkumflex",Euml:"Lateinischer Buchstabe E Trema",Igrave:"Lateinischer Buchstabe I mit AkzentGrave",Iacute:"Lateinischer Buchstabe I mit Akutakzent",Icirc:"Lateinischer Buchstabe I mit Zirkumflex", -Iuml:"Lateinischer Buchstabe I mit Trema",ETH:"Lateinischer Buchstabe Eth",Ntilde:"Lateinischer Buchstabe N mit Tilde",Ograve:"Lateinischer Buchstabe O mit AkzentGrave",Oacute:"Lateinischer Buchstabe O mit Akutakzent",Ocirc:"Lateinischer Buchstabe O mit Zirkumflex",Otilde:"Lateinischer Buchstabe O mit Tilde",Ouml:"Lateinischer Buchstabe O mit Trema",times:"Multiplikation",Oslash:"Lateinischer Buchstabe O durchgestrichen",Ugrave:"Lateinischer Buchstabe U mit Akzentgrave",Uacute:"Lateinischer Buchstabe U mit Akutakzent", -Ucirc:"Lateinischer Buchstabe U mit Zirkumflex",Uuml:"Lateinischer Buchstabe a mit Trema",Yacute:"Lateinischer Buchstabe a mit Akzent",THORN:"Lateinischer Buchstabe mit Dorn",szlig:"Kleiner lateinischer Buchstabe scharfe s",agrave:"Kleiner lateinischer Buchstabe a mit Accent grave",aacute:"Kleiner lateinischer Buchstabe a mit Akut",acirc:"Lateinischer Buchstabe a mit Zirkumflex",atilde:"Lateinischer Buchstabe a mit Tilde",auml:"Kleiner lateinischer Buchstabe a mit Trema",aring:"Kleiner lateinischer Buchstabe a mit Ring oben", -aelig:"Lateinischer Buchstabe æ",ccedil:"Kleiner lateinischer Buchstabe c mit Cedille",egrave:"Kleiner lateinischer Buchstabe e mit Accent grave",eacute:"Kleiner lateinischer Buchstabe e mit Akut",ecirc:"Kleiner lateinischer Buchstabe e mit Zirkumflex",euml:"Kleiner lateinischer Buchstabe e mit Trema",igrave:"Kleiner lateinischer Buchstabe i mit AkzentGrave",iacute:"Kleiner lateinischer Buchstabe i mit Akzent",icirc:"Kleiner lateinischer Buchstabe i mit Zirkumflex",iuml:"Kleiner lateinischer Buchstabe i mit Trema", -eth:"Kleiner lateinischer Buchstabe eth",ntilde:"Kleiner lateinischer Buchstabe n mit Tilde",ograve:"Kleiner lateinischer Buchstabe o mit Accent grave",oacute:"Kleiner lateinischer Buchstabe o mit Akzent",ocirc:"Kleiner lateinischer Buchstabe o mit Zirkumflex",otilde:"Lateinischer Buchstabe i mit Tilde",ouml:"Kleiner lateinischer Buchstabe o mit Trema",divide:"Divisionszeichen",oslash:"Kleiner lateinischer Buchstabe o durchgestrichen",ugrave:"Kleiner lateinischer Buchstabe u mit Accent grave",uacute:"Kleiner lateinischer Buchstabe u mit Akut", -ucirc:"Kleiner lateinischer Buchstabe u mit Zirkumflex",uuml:"Kleiner lateinischer Buchstabe u mit Trema",yacute:"Kleiner lateinischer Buchstabe y mit Akut",thorn:"Kleiner lateinischer Buchstabe Dorn",yuml:"Kleiner lateinischer Buchstabe y mit Trema",OElig:"Lateinischer Buchstabe Ligatur OE",oelig:"Kleiner lateinischer Buchstabe Ligatur OE",372:"Lateinischer Buchstabe W mit Zirkumflex",374:"Lateinischer Buchstabe Y mit Zirkumflex",373:"Kleiner lateinischer Buchstabe w mit Zirkumflex",375:"Kleiner lateinischer Buchstabe y mit Zirkumflex", -sbquo:"Tiefergestelltes Komma",8219:"Rumgedrehtes Komma",bdquo:"Doppeltes Anführungszeichen unten",hellip:"horizontale Auslassungspunkte",trade:"Handelszeichen",9658:"Dreickspfeil rechts",bull:"Bullet",rarr:"Pfeil rechts",rArr:"Doppelpfeil rechts",hArr:"Doppelpfeil links",diams:"Karo",asymp:"Ungefähr"}); \ No newline at end of file +CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen", +not:"Not-Zeichen",reg:"Registriert-Zeichen",macr:"Längezeichen",deg:"Grad-Zeichen",sup2:"Hoch 2",sup3:"Hoch 3",acute:"Akzentzeichen ",micro:"Mikro-Zeichen",para:"Pilcrow-Zeichen",middot:"Mittelpunkt",cedil:"Cedilla",sup1:"Hoch 1",ordm:"Männliche Ordnungszahl Anzeige",raquo:"Nach rechts zeigenden Doppel-Winkel Anführungszeichen",frac14:"ein Viertel",frac12:"Hälfte",frac34:"Dreiviertel",iquest:"Umgekehrtes Fragezeichen",Agrave:"Lateinischer Buchstabe A mit AkzentGrave",Aacute:"Lateinischer Buchstabe A mit Akutakzent", +Acirc:"Lateinischer Buchstabe A mit Zirkumflex",Atilde:"Lateinischer Buchstabe A mit Tilde",Auml:"Lateinischer Buchstabe A mit Trema",Aring:"Lateinischer Buchstabe A mit Ring oben",AElig:"Lateinischer Buchstabe Æ",Ccedil:"Lateinischer Buchstabe C mit Cedille",Egrave:"Lateinischer Buchstabe E mit AkzentGrave",Eacute:"Lateinischer Buchstabe E mit Akutakzent",Ecirc:"Lateinischer Buchstabe E mit Zirkumflex",Euml:"Lateinischer Buchstabe E Trema",Igrave:"Lateinischer Buchstabe I mit AkzentGrave",Iacute:"Lateinischer Buchstabe I mit Akutakzent", +Icirc:"Lateinischer Buchstabe I mit Zirkumflex",Iuml:"Lateinischer Buchstabe I mit Trema",ETH:"Lateinischer Buchstabe Eth",Ntilde:"Lateinischer Buchstabe N mit Tilde",Ograve:"Lateinischer Buchstabe O mit AkzentGrave",Oacute:"Lateinischer Buchstabe O mit Akutakzent",Ocirc:"Lateinischer Buchstabe O mit Zirkumflex",Otilde:"Lateinischer Buchstabe O mit Tilde",Ouml:"Lateinischer Buchstabe O mit Trema",times:"Multiplikation",Oslash:"Lateinischer Buchstabe O durchgestrichen",Ugrave:"Lateinischer Buchstabe U mit Akzentgrave", +Uacute:"Lateinischer Buchstabe U mit Akutakzent",Ucirc:"Lateinischer Buchstabe U mit Zirkumflex",Uuml:"Lateinischer Buchstabe a mit Trema",Yacute:"Lateinischer Buchstabe a mit Akzent",THORN:"Lateinischer Buchstabe mit Dorn",szlig:"Kleiner lateinischer Buchstabe scharfe s",agrave:"Kleiner lateinischer Buchstabe a mit Accent grave",aacute:"Kleiner lateinischer Buchstabe a mit Akut",acirc:"Lateinischer Buchstabe a mit Zirkumflex",atilde:"Lateinischer Buchstabe a mit Tilde",auml:"Kleiner lateinischer Buchstabe a mit Trema", +aring:"Kleiner lateinischer Buchstabe a mit Ring oben",aelig:"Lateinischer Buchstabe æ",ccedil:"Kleiner lateinischer Buchstabe c mit Cedille",egrave:"Kleiner lateinischer Buchstabe e mit Accent grave",eacute:"Kleiner lateinischer Buchstabe e mit Akut",ecirc:"Kleiner lateinischer Buchstabe e mit Zirkumflex",euml:"Kleiner lateinischer Buchstabe e mit Trema",igrave:"Kleiner lateinischer Buchstabe i mit AkzentGrave",iacute:"Kleiner lateinischer Buchstabe i mit Akzent",icirc:"Kleiner lateinischer Buchstabe i mit Zirkumflex", +iuml:"Kleiner lateinischer Buchstabe i mit Trema",eth:"Kleiner lateinischer Buchstabe eth",ntilde:"Kleiner lateinischer Buchstabe n mit Tilde",ograve:"Kleiner lateinischer Buchstabe o mit Accent grave",oacute:"Kleiner lateinischer Buchstabe o mit Akzent",ocirc:"Kleiner lateinischer Buchstabe o mit Zirkumflex",otilde:"Lateinischer Buchstabe i mit Tilde",ouml:"Kleiner lateinischer Buchstabe o mit Trema",divide:"Divisionszeichen",oslash:"Kleiner lateinischer Buchstabe o durchgestrichen",ugrave:"Kleiner lateinischer Buchstabe u mit Accent grave", +uacute:"Kleiner lateinischer Buchstabe u mit Akut",ucirc:"Kleiner lateinischer Buchstabe u mit Zirkumflex",uuml:"Kleiner lateinischer Buchstabe u mit Trema",yacute:"Kleiner lateinischer Buchstabe y mit Akut",thorn:"Kleiner lateinischer Buchstabe Dorn",yuml:"Kleiner lateinischer Buchstabe y mit Trema",OElig:"Lateinischer Buchstabe Ligatur OE",oelig:"Kleiner lateinischer Buchstabe Ligatur OE",372:"Lateinischer Buchstabe W mit Zirkumflex",374:"Lateinischer Buchstabe Y mit Zirkumflex",373:"Kleiner lateinischer Buchstabe w mit Zirkumflex", +375:"Kleiner lateinischer Buchstabe y mit Zirkumflex",sbquo:"Tiefergestelltes Komma",8219:"Rumgedrehtes Komma",bdquo:"Doppeltes Anführungszeichen unten",hellip:"horizontale Auslassungspunkte",trade:"Handelszeichen",9658:"Dreickspfeil rechts",bull:"Bullet",rarr:"Pfeil rechts",rArr:"Doppelpfeil rechts",hArr:"Doppelpfeil links",diams:"Karo",asymp:"Ungefähr"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js index e7c2a219513..b31e8f4eb23 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js @@ -1,13 +1,13 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας διπλού εισαγωγικού",rdquo:"Δεξιός χαρακτήρας διπλού εισαγωγικού",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων", -ordf:"Feminine ordinal indicator",laquo:"Αριστερός χαρακτήρας διπλού εισαγωγικού",not:"Not sign",reg:"Σύμβολο σημάτων κατατεθέν",macr:"Μακρόν",deg:"Σύμβολο βαθμού",sup2:"Εκτεθειμένο δύο",sup3:"Εκτεθειμένο τρία",acute:"Οξεία",micro:"Σύμβολο μικρού",para:"Σύμβολο παραγράφου",middot:"Μέση τελεία",cedil:"Υπογεγραμμένη",sup1:"Εκτεθειμένο ένα",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Γνήσιο κλάσμα ενός τετάρτου",frac12:"Γνήσιο κλάσμα ενός δεύτερου",frac34:"Γνήσιο κλάσμα τριών τετάρτων", +CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας ευθύγραμμων εισαγωγικών",rdquo:"Δεξιός χαρακτήρας ευθύγραμμων εισαγωγικών",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων", +ordf:"Θηλυκός τακτικός δείκτης",laquo:"Γωνιώδη εισαγωγικά αριστερής κατάδειξης",not:"Σύμβολο άρνησης",reg:"Σύμβολο σημάτων κατατεθέν",macr:"Μακρόν",deg:"Σύμβολο βαθμού",sup2:"Εκτεθειμένο δύο",sup3:"Εκτεθειμένο τρία",acute:"Οξεία",micro:"Σύμβολο μικρού",para:"Σύμβολο παραγράφου",middot:"Μέση τελεία",cedil:"Υπογεγραμμένη",sup1:"Εκτεθειμένο ένα",ordm:"Αρσενικός τακτικός δείκτης",raquo:"Γωνιώδη εισαγωγικά δεξιάς κατάδειξης",frac14:"Γνήσιο κλάσμα ενός τετάρτου",frac12:"Γνήσιο κλάσμα ενός δεύτερου",frac34:"Γνήσιο κλάσμα τριών τετάρτων", iquest:"Ανάποδο θαυμαστικό",Agrave:"Λατινικό κεφαλαίο γράμμα A με βαρεία",Aacute:"Λατινικό κεφαλαίο γράμμα A με οξεία",Acirc:"Λατινικό κεφαλαίο γράμμα A με περισπωμένη",Atilde:"Λατινικό κεφαλαίο γράμμα A με περισπωμένη",Auml:"Λατινικό κεφαλαίο γράμμα A με διαλυτικά",Aring:"Λατινικό κεφαλαίο γράμμα A με δακτύλιο επάνω",AElig:"Λατινικό κεφαλαίο γράμμα Æ",Ccedil:"Λατινικό κεφαλαίο γράμμα C με υπογεγραμμένη",Egrave:"Λατινικό κεφαλαίο γράμμα E με βαρεία",Eacute:"Λατινικό κεφαλαίο γράμμα E με οξεία",Ecirc:"Λατινικό κεφαλαίο γράμμα Ε με περισπωμένη ", Euml:"Λατινικό κεφαλαίο γράμμα Ε με διαλυτικά",Igrave:"Λατινικό κεφαλαίο γράμμα I με βαρεία",Iacute:"Λατινικό κεφαλαίο γράμμα I με οξεία",Icirc:"Λατινικό κεφαλαίο γράμμα I με περισπωμένη",Iuml:"Λατινικό κεφαλαίο γράμμα I με διαλυτικά ",ETH:"Λατινικό κεφαλαίο γράμμα Eth",Ntilde:"Λατινικό κεφαλαίο γράμμα N με περισπωμένη",Ograve:"Λατινικό κεφαλαίο γράμμα O με βαρεία",Oacute:"Λατινικό κεφαλαίο γράμμα O με οξεία",Ocirc:"Λατινικό κεφαλαίο γράμμα O με περισπωμένη ",Otilde:"Λατινικό κεφαλαίο γράμμα O με περισπωμένη", Ouml:"Λατινικό κεφαλαίο γράμμα O με διαλυτικά",times:"Σύμβολο πολλαπλασιασμού",Oslash:"Λατινικό κεφαλαίο γράμμα O με μολυβιά",Ugrave:"Λατινικό κεφαλαίο γράμμα U με βαρεία",Uacute:"Λατινικό κεφαλαίο γράμμα U με οξεία",Ucirc:"Λατινικό κεφαλαίο γράμμα U με περισπωμένη",Uuml:"Λατινικό κεφαλαίο γράμμα U με διαλυτικά",Yacute:"Λατινικό κεφαλαίο γράμμα Y με οξεία",THORN:"Λατινικό κεφαλαίο γράμμα Thorn",szlig:"Λατινικό μικρό γράμμα απότομο s",agrave:"Λατινικό μικρό γράμμα a με βαρεία",aacute:"Λατινικό μικρό γράμμα a με οξεία", acirc:"Λατινικό μικρό γράμμα a με περισπωμένη",atilde:"Λατινικό μικρό γράμμα a με περισπωμένη",auml:"Λατινικό μικρό γράμμα a με διαλυτικά",aring:"Λατινικό μικρό γράμμα a με δακτύλιο πάνω",aelig:"Λατινικό μικρό γράμμα æ",ccedil:"Λατινικό μικρό γράμμα c με υπογεγραμμένη",egrave:"Λατινικό μικρό γράμμα ε με βαρεία",eacute:"Λατινικό μικρό γράμμα e με οξεία",ecirc:"Λατινικό μικρό γράμμα e με περισπωμένη",euml:"Λατινικό μικρό γράμμα e με διαλυτικά",igrave:"Λατινικό μικρό γράμμα i με βαρεία",iacute:"Λατινικό μικρό γράμμα i με οξεία", icirc:"Λατινικό μικρό γράμμα i με περισπωμένη",iuml:"Λατινικό μικρό γράμμα i με διαλυτικά",eth:"Λατινικό μικρό γράμμα eth",ntilde:"Λατινικό μικρό γράμμα n με περισπωμένη",ograve:"Λατινικό μικρό γράμμα o με βαρεία",oacute:"Λατινικό μικρό γράμμα o με οξεία ",ocirc:"Λατινικό πεζό γράμμα o με περισπωμένη",otilde:"Λατινικό μικρό γράμμα o με περισπωμένη ",ouml:"Λατινικό μικρό γράμμα o με διαλυτικά",divide:"Σύμβολο διαίρεσης",oslash:"Λατινικό μικρό γράμμα o με περισπωμένη",ugrave:"Λατινικό μικρό γράμμα u με βαρεία", uacute:"Λατινικό μικρό γράμμα u με οξεία",ucirc:"Λατινικό μικρό γράμμα u με περισπωμένη",uuml:"Λατινικό μικρό γράμμα u με διαλυτικά",yacute:"Λατινικό μικρό γράμμα y με οξεία",thorn:"Λατινικό μικρό γράμμα thorn",yuml:"Λατινικό μικρό γράμμα y με διαλυτικά",OElig:"Λατινικό κεφαλαίο σύμπλεγμα ΟΕ",oelig:"Λατινικό μικρό σύμπλεγμα oe",372:"Λατινικό κεφαλαίο γράμμα W με περισπωμένη",374:"Λατινικό κεφαλαίο γράμμα Y με περισπωμένη",373:"Λατινικό μικρό γράμμα w με περισπωμένη",375:"Λατινικό μικρό γράμμα y με περισπωμένη", -sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Οριζόντια αποσιωπητικά",trade:"Σύμβολο εμπορικού κατατεθέν",9658:"Μαύρος δείκτης που δείχνει προς τα δεξιά",bull:"Κουκκίδα",rarr:"Δεξί βελάκι",rArr:"Διπλό δεξί βελάκι",hArr:"Διπλό βελάκι αριστερά-δεξιά",diams:"Μαύρο διαμάντι",asymp:"Σχεδόν ίσο με"}); \ No newline at end of file +sbquo:"Ενιαίο χαμηλο -9 εισαγωγικό ",8219:"Ενιαίο υψηλο ανεστραμμένο-9 εισαγωγικό ",bdquo:"Διπλό χαμηλό-9 εισαγωγικό ",hellip:"Οριζόντια αποσιωπητικά",trade:"Σύμβολο εμπορικού κατατεθέν",9658:"Μαύρος δείκτης που δείχνει προς τα δεξιά",bull:"Κουκκίδα",rarr:"Δεξί βελάκι",rArr:"Διπλό δεξί βελάκι",hArr:"Διπλό βελάκι αριστερά-δεξιά",diams:"Μαύρο διαμάντι",asymp:"Σχεδόν ίσο με"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js index 5a1478636df..08de5616f30 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","en-gb",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js index 26f61c2e2c1..418406d261d 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","en",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js index d44b0d2eb19..c5803d54d5a 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","eo",{euro:"Eŭrosigno",lsquo:"Supra 6-citilo",rsquo:"Supra 9-citilo",ldquo:"Supra 66-citilo",rdquo:"Supra 99-citilo",ndash:"Streketo",mdash:"Substreko",iexcl:"Renversita krisigno",cent:"Cendosigno",pound:"Pundosigno",curren:"Monersigno",yen:"Enosigno",brvbar:"Rompita vertikala streko",sect:"Kurba paragrafo",uml:"Tremao",copy:"Kopirajtosigno",ordf:"Adjektiva numerfinaĵo",laquo:"Duobla malplio-citilo",not:"Negohoko",reg:"Registrita marko",macr:"Superstreko",deg:"Gradosigno", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js index 79d437f974f..e91f1a0ac52 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","es",{euro:"Símbolo de euro",lsquo:"Comilla simple izquierda",rsquo:"Comilla simple derecha",ldquo:"Comilla doble izquierda",rdquo:"Comilla doble derecha",ndash:"Guión corto",mdash:"Guión medio largo",iexcl:"Signo de admiración invertido",cent:"Símbolo centavo",pound:"Símbolo libra",curren:"Símbolo moneda",yen:"Símbolo yen",brvbar:"Barra vertical rota",sect:"Símbolo sección",uml:"Diéresis",copy:"Signo de derechos de autor",ordf:"Indicador ordinal femenino",laquo:"Abre comillas angulares", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js index 22c90561d95..2a208837b3e 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","et",{euro:"Euromärk",lsquo:"Alustav ühekordne jutumärk",rsquo:"Lõpetav ühekordne jutumärk",ldquo:"Alustav kahekordne jutumärk",rdquo:"Lõpetav kahekordne jutumärk",ndash:"Enn-kriips",mdash:"Emm-kriips",iexcl:"Pööratud hüüumärk",cent:"Sendimärk",pound:"Naela märk",curren:"Valuutamärk",yen:"Jeeni märk",brvbar:"Katkestatud kriips",sect:"Lõigu märk",uml:"Täpid",copy:"Autoriõiguse märk",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js new file mode 100644 index 00000000000..a93e0ce579d --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js @@ -0,0 +1,13 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", +not:"Ez zeinua",reg:"Registered sign",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent", +Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent", +Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke", +Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis", +aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth", +ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",uuml:"Latin small letter u with diaeresis", +yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Horizontal ellipsis", +trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js index e0b27c59d71..c3efb3ce402 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","fa",{euro:"نشان یورو",lsquo:"علامت نقل قول تکی چپ",rsquo:"علامت نقل قول تکی راست",ldquo:"علامت نقل قول دوتایی چپ",rdquo:"علامت نقل قول دوتایی راست",ndash:"خط تیره En",mdash:"خط تیره Em",iexcl:"علامت تعجب وارونه",cent:"نشان سنت",pound:"نشان پوند",curren:"نشان ارز",yen:"نشان ین",brvbar:"نوار شکسته",sect:"نشان بخش",uml:"نشان سواگیری",copy:"نشان کپی رایت",ordf:"شاخص ترتیبی مونث",laquo:"اشاره چپ مکرر برای زاویه علامت نقل قول",not:"نشان ثبت نشده",reg:"نشان ثبت شده", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js index 6d701e3c9b7..79f4a7d9b51 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","fi",{euro:"Euron merkki",lsquo:"Vasen yksittäinen lainausmerkki",rsquo:"Oikea yksittäinen lainausmerkki",ldquo:"Vasen kaksoislainausmerkki",rdquo:"Oikea kaksoislainausmerkki",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Sentin merkki",pound:"Punnan merkki",curren:"Valuuttamerkki",yen:"Yenin merkki",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js index d19e2e42d6c..24a0d0da907 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","fr-ca",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret",iexcl:"Point d'exclamation inversé",cent:"Symbole de cent",pound:"Symbole de Livre Sterling",curren:"Symbole monétaire",yen:"Symbole du Yen",brvbar:"Barre scindée",sect:"Symbole de section",uml:"Tréma",copy:"Symbole de copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js index 2d1ad09660f..a7a9fa69a48 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js @@ -1,9 +1,9 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole Cent",pound:"Symbole Livre Sterling",curren:"Symbole monétaire",yen:"Symbole Yen",brvbar:"Barre verticale scindée",sect:"Section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant", -not:"Crochet de négation",reg:"Marque déposée",macr:"Macron",deg:"Degré",sup2:"Exposant 2",sup3:"\\tExposant 3",acute:"Accent aigu",micro:"Omicron",para:"Paragraphe",middot:"Point médian",cedil:"Cédille",sup1:"\\tExposant 1",ordm:"Indicateur ordinal masculin",raquo:"Guillemet français fermant",frac14:"Un quart",frac12:"Un demi",frac34:"Trois quarts",iquest:"Point d'interrogation inversé",Agrave:"A majuscule accent grave",Aacute:"A majuscule accent aigu",Acirc:"A majuscule accent circonflexe",Atilde:"A majuscule avec caron", +not:"Crochet de négation",reg:"Marque déposée",macr:"Macron",deg:"Degré",sup2:"Exposant 2",sup3:"Exposant 3",acute:"Accent aigu",micro:"Omicron",para:"Paragraphe",middot:"Point médian",cedil:"Cédille",sup1:"Exposant 1",ordm:"Indicateur ordinal masculin",raquo:"Guillemet français fermant",frac14:"Un quart",frac12:"Un demi",frac34:"Trois quarts",iquest:"Point d'interrogation inversé",Agrave:"A majuscule accent grave",Aacute:"A majuscule accent aigu",Acirc:"A majuscule accent circonflexe",Atilde:"A majuscule avec caron", Auml:"A majuscule tréma",Aring:"A majuscule avec un rond au-dessus",AElig:"Æ majuscule ligaturés",Ccedil:"C majuscule cédille",Egrave:"E majuscule accent grave",Eacute:"E majuscule accent aigu",Ecirc:"E majuscule accent circonflexe",Euml:"E majuscule tréma",Igrave:"I majuscule accent grave",Iacute:"I majuscule accent aigu",Icirc:"I majuscule accent circonflexe",Iuml:"I majuscule tréma",ETH:"Lettre majuscule islandaise ED",Ntilde:"N majuscule avec caron",Ograve:"O majuscule accent grave",Oacute:"O majuscule accent aigu", Ocirc:"O majuscule accent circonflexe",Otilde:"O majuscule avec caron",Ouml:"O majuscule tréma",times:"Multiplication",Oslash:"O majuscule barré",Ugrave:"U majuscule accent grave",Uacute:"U majuscule accent aigu",Ucirc:"U majuscule accent circonflexe",Uuml:"U majuscule tréma",Yacute:"Y majuscule accent aigu",THORN:"Lettre islandaise Thorn majuscule",szlig:"Lettre minuscule allemande s dur",agrave:"a minuscule accent grave",aacute:"a minuscule accent aigu",acirc:"a minuscule accent circonflexe",atilde:"a minuscule avec caron", auml:"a minuscule tréma",aring:"a minuscule avec un rond au-dessus",aelig:"æ minuscule ligaturés",ccedil:"c minuscule cédille",egrave:"e minuscule accent grave",eacute:"e minuscule accent aigu",ecirc:"e minuscule accent circonflexe",euml:"e minuscule tréma",igrave:"i minuscule accent grave",iacute:"i minuscule accent aigu",icirc:"i minuscule accent circonflexe",iuml:"i minuscule tréma",eth:"Lettre minuscule islandaise ED",ntilde:"n minuscule avec caron",ograve:"o minuscule accent grave",oacute:"o minuscule accent aigu", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js index f16d36672d1..797ecc53260 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","gl",{euro:"Símbolo do euro",lsquo:"Comiña simple esquerda",rsquo:"Comiña simple dereita",ldquo:"Comiñas dobres esquerda",rdquo:"Comiñas dobres dereita",ndash:"Guión",mdash:"Raia",iexcl:"Signo de admiración invertido",cent:"Símbolo do centavo",pound:"Símbolo da libra",curren:"Símbolo de moeda",yen:"Símbolo do yen",brvbar:"Barra vertical rota",sect:"Símbolo de sección",uml:"Diérese",copy:"Símbolo de dereitos de autoría",ordf:"Indicador ordinal feminino",laquo:"Comiñas latinas, apertura", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js index dcfc50f093f..75935897607 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","he",{euro:"יורו",lsquo:"סימן ציטוט יחיד שמאלי",rsquo:"סימן ציטוט יחיד ימני",ldquo:"סימן ציטוט כפול שמאלי",rdquo:"סימן ציטוט כפול ימני",ndash:"קו מפריד קצר",mdash:"קו מפריד ארוך",iexcl:"סימן קריאה הפוך",cent:"סנט",pound:"פאונד",curren:"מטבע",yen:"ין",brvbar:"קו שבור",sect:"סימן מקטע",uml:"שתי נקודות אופקיות (Diaeresis)",copy:"סימן זכויות יוצרים (Copyright)",ordf:"סימן אורדינאלי נקבי",laquo:"סימן ציטוט זווית כפולה לשמאל",not:"סימן שלילה מתמטי",reg:"סימן רשום", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js index 1b070a397a0..65754321391 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js @@ -1,9 +1,9 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","hr",{euro:"Euro znak",lsquo:"Lijevi jednostruki navodnik",rsquo:"Desni jednostruki navodnik",ldquo:"Lijevi dvostruki navodnik",rdquo:"Desni dvostruki navodnik",ndash:"En crtica",mdash:"Em crtica",iexcl:"Naopaki uskličnik",cent:"Cent znak",pound:"Funta znak",curren:"Znak valute",yen:"Yen znak",brvbar:"Potrgana prečka",sect:"Znak odjeljka",uml:"Prijeglasi",copy:"Copyright znak",ordf:"Feminine ordinal indicator",laquo:"Lijevi dvostruki uglati navodnik",not:"Not znak", -reg:"Registered znak",macr:"Macron",deg:"Stupanj znak",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro znak",para:"Pilcrow sign",middot:"Srednja točka",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Desni dvostruku uglati navodnik",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Naopaki upitnik",Agrave:"Veliko latinsko slovo A s akcentom",Aacute:"Latin capital letter A with acute accent", +reg:"Registered znak",macr:"Macron",deg:"Stupanj znak",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro znak",para:"Pilcrow sign",middot:"Srednja točka",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Desni dvostruku uglati navodnik",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Naopaki upitnik",Agrave:"Veliko latinsko slovo A s akcentom",Aacute:"Latinično veliko slovo A sa oštrim naglaskom", Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent", Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent", Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js index 79483051f0b..44554839d02 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","hu",{euro:"Euró jel",lsquo:"Bal szimpla idézőjel",rsquo:"Jobb szimpla idézőjel",ldquo:"Bal dupla idézőjel",rdquo:"Jobb dupla idézőjel",ndash:"Rövid gondolatjel",mdash:"Hosszú gondolatjel",iexcl:"Fordított felkiáltójel",cent:"Cent jel",pound:"Font jel",curren:"Valuta jel",yen:"Yen jel",brvbar:"Hosszú kettőspont",sect:"Paragrafus jel",uml:"Kettős hangzó jel",copy:"Szerzői jog jel",ordf:"Női sorrend mutatója",laquo:"Balra mutató duplanyíl",not:"Feltételes kötőjel", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js index 4928f4004c4..1b4bd679519 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js index 894b56ce8bb..6b090973eec 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","it",{euro:"Simbolo Euro",lsquo:"Virgoletta singola sinistra",rsquo:"Virgoletta singola destra",ldquo:"Virgolette aperte",rdquo:"Virgolette chiuse",ndash:"Trattino",mdash:"Trattino lungo",iexcl:"Punto esclavamativo invertito",cent:"Simbolo Cent",pound:"Simbolo Sterlina",curren:"Simbolo Moneta",yen:"Simbolo Yen",brvbar:"Barra interrotta",sect:"Simbolo di sezione",uml:"Dieresi",copy:"Simbolo Copyright",ordf:"Indicatore ordinale femminile",laquo:"Virgolette basse aperte", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js index 84fb8fa2e28..b32e8902976 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","ja",{euro:"ユーロ記号",lsquo:"左シングル引用符",rsquo:"右シングル引用符",ldquo:"左ダブル引用符",rdquo:"右ダブル引用符",ndash:"半角ダッシュ",mdash:"全角ダッシュ",iexcl:"逆さ感嘆符",cent:"セント記号",pound:"ポンド記号",curren:"通貨記号",yen:"円記号",brvbar:"上下に分かれた縦棒",sect:"節記号",uml:"分音記号(ウムラウト)",copy:"著作権表示記号",ordf:"女性序数標識",laquo:" 始め二重山括弧引用記号",not:"論理否定記号",reg:"登録商標記号",macr:"長音符",deg:"度記号",sup2:"上つき2, 2乗",sup3:"上つき3, 3乗",acute:"揚音符",micro:"ミクロン記号",para:"段落記号",middot:"中黒",cedil:"セディラ",sup1:"上つき1",ordm:"男性序数標識",raquo:"終わり二重山括弧引用記号", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js index 65a7518dfae..8d6a3d161d2 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","km",{euro:"សញ្ញា​អឺរ៉ូ",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"សញ្ញា​សេន",pound:"សញ្ញា​ផោន",curren:"សញ្ញា​រូបិយបណ្ណ",yen:"សញ្ញា​យ៉េន",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"សញ្ញា​រក្សា​សិទ្ធិ",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js new file mode 100644 index 00000000000..77207edf1fa --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js @@ -0,0 +1,10 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","ko",{euro:"유로화 기호",lsquo:"왼쪽 외 따옴표",rsquo:"오른쪽 외 따옴표",ldquo:"왼쪽 쌍 따옴표",rdquo:"오른쪽 쌍 따옴표",ndash:"반각 대시",mdash:"전각 대시",iexcl:"반전된 느낌표",cent:"센트 기호",pound:"파운드화 기호",curren:"커런시 기호",yen:"위안화 기호",brvbar:"Broken bar",sect:"섹션 기호",uml:"분음 부호",copy:"저작권 기호",ordf:"Feminine ordinal indicator",laquo:"왼쪽 쌍꺽쇠 인용 부호",not:"금지 기호",reg:"등록 기호",macr:"장음 기호",deg:"도 기호",sup2:"위첨자 2",sup3:"위첨자 3",acute:"양음 악센트 부호",micro:"마이크로 기호",para:"단락 기호",middot:"가운데 점",cedil:"세디유",sup1:"위첨자 1", +ordm:"Masculine ordinal indicator",raquo:"오른쪽 쌍꺽쇠 인용 부호",frac14:"분수 사분의 일",frac12:"분수 이분의 일",frac34:"분수 사분의 삼",iquest:"뒤집힌 물음표",Agrave:"억음 부호가 있는 라틴 대문자 A",Aacute:"양음 악센트 부호가 있는 라틴 대문자 A",Acirc:"곡절 악센트 부호가 있는 라틴 대문자 A",Atilde:"틸데가 있는 라틴 대문자 A",Auml:"분음 기호가 있는 라틴 대문자 A",Aring:"윗고리가 있는 라틴 대문자 A",AElig:"라틴 대문자 Æ",Ccedil:"세디유가 있는 라틴 대문자 C",Egrave:"억음 부호가 있는 라틴 대문자 E",Eacute:"양음 악센트 부호가 있는 라틴 대문자 E",Ecirc:"곡절 악센트 부호가 있는 라틴 대문자 E",Euml:"분음 기호가 있는 라틴 대문자 E",Igrave:"억음 부호가 있는 라틴 대문자 I",Iacute:"양음 악센트 부호가 있는 라틴 대문자 I", +Icirc:"곡절 악센트 부호가 있는 라틴 대문자 I",Iuml:"분음 기호가 있는 라틴 대문자 I",ETH:"라틴 대문자 Eth",Ntilde:"틸데가 있는 라틴 대문자 N",Ograve:"억음 부호가 있는 라틴 대문자 O",Oacute:"양음 부호가 있는 라틴 대문자 O",Ocirc:"곡절 악센트 부호가 있는 라틴 대문자 O",Otilde:"틸데가 있는 라틴 대문자 O",Ouml:"분음 기호가 있는 라틴 대문자 O",times:"곱하기 기호",Oslash:"사선이 있는 라틴 대문자 O",Ugrave:"억음 부호가 있는 라틴 대문자 U",Uacute:"양음 부호가 있는 라틴 대문자 U",Ucirc:"곡절 악센트 부호가 있는 라틴 대문자 U",Uuml:"분음 기호가 있는 라틴 대문자 U",Yacute:"양음 부호가 있는 라틴 대문자 Y",THORN:"라틴 대문자 Thorn",szlig:"라틴 소문자 sharp s",agrave:"억음 부호가 있는 라틴 소문자 a",aacute:"양음 부호가 있는 라틴 소문자 a", +acirc:"곡절 악센트 부호가 있는 라틴 소문자 a",atilde:"틸데가 있는 라틴 소문자 a",auml:"분음 기호가 있는 라틴 소문자 a",aring:"윗고리가 있는 라틴 소문자 a",aelig:"라틴 소문자 æ",ccedil:"세디유가 있는 라틴 소문자 c",egrave:"억음 부호가 있는 라틴 소문자 e",eacute:"양음 부호가 있는 라틴 소문자 e",ecirc:"곡절 악센트 부호가 있는 라틴 소문자 e",euml:"분음 기호가 있는 라틴 소문자 e",igrave:"억음 부호가 있는 라틴 소문자 i",iacute:"양음 부호가 있는 라틴 소문자 i",icirc:"곡절 악센트 부호가 있는 라틴 소문자 i",iuml:"분음 기호가 있는 라틴 소문자 i",eth:"라틴 소문자 eth",ntilde:"틸데가 있는 라틴 소문자 n",ograve:"억음 부호가 있는 라틴 소문자 o",oacute:"양음 부호가 있는 라틴 소문자 o",ocirc:"곡절 악센트 부호가 있는 라틴 소문자 o", +otilde:"틸데가 있는 라틴 소문자 o",ouml:"분음 기호가 있는 라틴 소문자 o",divide:"나누기 기호",oslash:"사선이 있는 라틴 소문자 o",ugrave:"억음 부호가 있는 라틴 소문자 u",uacute:"양음 부호가 있는 라틴 소문자 u",ucirc:"곡절 악센트 부호가 있는 라틴 소문자 u",uuml:"분음 기호가 있는 라틴 소문자 u",yacute:"양음 부호가 있는 라틴 소문자 y",thorn:"라틴 소문자 thorn",yuml:"분음 기호가 있는 라틴 소문자 y",OElig:"라틴 대문합자 OE",oelig:"라틴 소문합자 oe",372:"곡절 악센트 부호가 있는 라틴 대문자 W",374:"곡절 악센트 부호가 있는 라틴 대문자 Y",373:"곡절 악센트 부호가 있는 라틴 소문자 w",375:"곡절 악센트 부호가 있는 라틴 소문자 y",sbquo:"외 아래-9 인용 부호",8219:"외 위쪽-뒤집힌-9 인용 부호",bdquo:"쌍 아래-9 인용 부호",hellip:"수평 생략 부호", +trade:"상표 기호",9658:"검정 오른쪽 포인터",bull:"큰 점",rarr:"오른쪽 화살표",rArr:"오른쪽 두 줄 화살표",hArr:"양쪽 두 줄 화살표",diams:"검정 다이아몬드",asymp:"근사"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js index 4917d4ade03..5bed679015c 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","ku",{euro:"نیشانەی یۆرۆ",lsquo:"نیشانەی فاریزەی سەرووژێری تاکی چەپ",rsquo:"نیشانەی فاریزەی سەرووژێری تاکی ڕاست",ldquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی چه‌پ",rdquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی ڕاست",ndash:"تەقەڵی کورت",mdash:"تەقەڵی درێژ",iexcl:"نیشانەی هەڵەوگێڕی سەرسوڕهێنەر",cent:"نیشانەی سەنت",pound:"نیشانەی پاوەند",curren:"نیشانەی دراو",yen:"نیشانەی یەنی ژاپۆنی",brvbar:"شریتی ئەستوونی پچڕاو",sect:"نیشانەی دوو s لەسەریەک",uml:"خاڵ",copy:"نیشانەی مافی چاپ", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js new file mode 100644 index 00000000000..f575dfd4149 --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js @@ -0,0 +1,13 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","lt",{euro:"Euro ženklas",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cento ženklas",pound:"Svaro ženklas",curren:"Valiutos ženklas",yen:"Jenos ženklas",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", +not:"Ne ženklas",reg:"Registered sign",macr:"Makronas",deg:"Laipsnio ženklas",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Mikro ženklas",para:"Pilcrow sign",middot:"Vidurinis taškas",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent", +Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin Capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent", +Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke", +Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis", +aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth", +ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",uuml:"Latin small letter u with diaeresis", +yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Horizontal ellipsis", +trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js index 50a77d36e93..7ea58a00fba 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","lv",{euro:"Euro zīme",lsquo:"Kreisā vienkārtīga pēdiņa",rsquo:"Labā vienkārtīga pēdiņa",ldquo:"Kreisā dubult pēdiņa",rdquo:"Labā dubult pēdiņa",ndash:"En svītra",mdash:"Em svītra",iexcl:"Apgriezta izsaukuma zīme",cent:"Centu naudas zīme",pound:"Sterliņu mārciņu naudas zīme",curren:"Valūtas zīme",yen:"Jenu naudas zīme",brvbar:"Vertikāla pārrauta līnija",sect:"Paragrāfa zīme",uml:"Diakritiska zīme",copy:"Autortiesību zīme",ordf:"Sievišķas kārtas rādītājs", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js index 0cdcde20076..f9fd879f5a6 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","nb",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js index 68edf37f42d..ba75bf39512 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","nl",{euro:"Euro-teken",lsquo:"Linker enkel aanhalingsteken",rsquo:"Rechter enkel aanhalingsteken",ldquo:"Linker dubbel aanhalingsteken",rdquo:"Rechter dubbel aanhalingsteken",ndash:"En dash",mdash:"Em dash",iexcl:"Omgekeerd uitroepteken",cent:"Cent-teken",pound:"Pond-teken",curren:"Valuta-teken",yen:"Yen-teken",brvbar:"Gebroken streep",sect:"Paragraaf-teken",uml:"Trema",copy:"Copyright-teken",ordf:"Vrouwelijk ordinaal",laquo:"Linker guillemet",not:"Ongelijk-teken", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js index eecc56c92d5..404b4fde3fa 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","no",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js index f21a09dbb4a..1af97e0688d 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","pl",{euro:"Znak euro",lsquo:"Cudzysłów pojedynczy otwierający",rsquo:"Cudzysłów pojedynczy zamykający",ldquo:"Cudzysłów apostrofowy otwierający",rdquo:"Cudzysłów apostrofowy zamykający",ndash:"Półpauza",mdash:"Pauza",iexcl:"Odwrócony wykrzyknik",cent:"Znak centa",pound:"Znak funta",curren:"Znak waluty",yen:"Znak jena",brvbar:"Przerwana pionowa kreska",sect:"Paragraf",uml:"Diereza",copy:"Znak praw autorskich",ordf:"Wskaźnik rodzaju żeńskiego liczebnika porządkowego", @@ -9,4 +9,4 @@ Iacute:"Wielka litera I z akcentem ostrym",Icirc:"Wielka litera I z akcentem prz Ucirc:"Wielka litera U z akcentem przeciągłym",Uuml:"Wielka litera U z dierezą",Yacute:"Wielka litera Y z akcentem ostrym",THORN:"Wielka litera Thorn",szlig:"Mała litera ostre s (eszet)",agrave:"Mała litera a z akcentem ciężkim",aacute:"Mała litera a z akcentem ostrym",acirc:"Mała litera a z akcentem przeciągłym",atilde:"Mała litera a z tyldą",auml:"Mała litera a z dierezą",aring:"Mała litera a z kółkiem",aelig:"Mała ligatura æ",ccedil:"Mała litera c z cedyllą",egrave:"Mała litera e z akcentem ciężkim", eacute:"Mała litera e z akcentem ostrym",ecirc:"Mała litera e z akcentem przeciągłym",euml:"Mała litera e z dierezą",igrave:"Mała litera i z akcentem ciężkim",iacute:"Mała litera i z akcentem ostrym",icirc:"Mała litera i z akcentem przeciągłym",iuml:"Mała litera i z dierezą",eth:"Mała litera eth",ntilde:"Mała litera n z tyldą",ograve:"Mała litera o z akcentem ciężkim",oacute:"Mała litera o z akcentem ostrym",ocirc:"Mała litera o z akcentem przeciągłym",otilde:"Mała litera o z tyldą",ouml:"Mała litera o z dierezą", divide:"Anglosaski znak dzielenia",oslash:"Mała litera o z przekreśleniem",ugrave:"Mała litera u z akcentem ciężkim",uacute:"Mała litera u z akcentem ostrym",ucirc:"Mała litera u z akcentem przeciągłym",uuml:"Mała litera u z dierezą",yacute:"Mała litera y z akcentem ostrym",thorn:"Mała litera thorn",yuml:"Mała litera y z dierezą",OElig:"Wielka ligatura OE",oelig:"Mała ligatura oe",372:"Wielka litera W z akcentem przeciągłym",374:"Wielka litera Y z akcentem przeciągłym",373:"Mała litera w z akcentem przeciągłym", -375:"Mała litera y z akcentem przeciągłym",sbquo:"Pojedynczy apostrof dolny",8219:"Pojedynczy apostrof górny",bdquo:"Podwójny apostrof dolny",hellip:"Wielokropek",trade:"Znak towarowy",9658:"Czarny wskaźnik wskazujący w prawo",bull:"Punktor",rarr:"Strzałka w prawo",rArr:"Podwójna strzałka w prawo",hArr:"Podwójna strzałka w lewo",diams:"Czarny znak karo",asymp:"Znak prawie równe"}); \ No newline at end of file +375:"Mała litera y z akcentem przeciągłym",sbquo:"Pojedynczy apostrof dolny",8219:"Pojedynczy apostrof górny",bdquo:"Podwójny apostrof dolny",hellip:"Wielokropek",trade:"Znak towarowy",9658:"Czarny wskaźnik wskazujący w prawo",bull:"Punktor",rarr:"Strzałka w prawo",rArr:"Podwójna strzałka w prawo",hArr:"Podwójna strzałka obustronna",diams:"Czarny znak karo",asymp:"Znak prawie równe"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js index e3f78319a36..41f8c3325f1 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","pt-br",{euro:"Euro",lsquo:"Aspas simples esquerda",rsquo:"Aspas simples direita",ldquo:"Aspas duplas esquerda",rdquo:"Aspas duplas direita",ndash:"Traço",mdash:"Travessão",iexcl:"Ponto de exclamação invertido",cent:"Cent",pound:"Cerquilha",curren:"Dinheiro",yen:"Yen",brvbar:"Bara interrompida",sect:"Símbolo de Parágrafo",uml:"Trema",copy:"Direito de Cópia",ordf:"Indicador ordinal feminino",laquo:"Aspas duplas angulares esquerda",not:"Negação",reg:"Marca Registrada", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js index 11ef746a66b..9c73f0c1e5f 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js @@ -1,13 +1,13 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo do Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão Simples",mdash:"Travessão Longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo do Cêntimo",pound:"Símbolo da Libra",curren:"Símbolo de Moeda",yen:"Símbolo do Iene",brvbar:"Barra quebrada",sect:"Símbolo de Secção",uml:"Trema",copy:"Símbolo dos Direitos de Autor",ordf:"Indicador ordinal feminino", -laquo:"Aspa esquerda ângulo duplo",not:"Não Símbolo",reg:"Símbolo de Registado",macr:"Mácron",deg:"Símbolo de Grau",sup2:"Expoente 2",sup3:"Expoente 3",acute:"Acento agudo",micro:"Símbolo de Micro",para:"Símbolo de Parágrafo",middot:"Ponto do Meio",cedil:"Cedilha",sup1:"Expoente 1",ordm:"Indicador ordinal masculino",raquo:"Aspas ângulo duplo pra Direita",frac14:"Fração vulgar 1/4",frac12:"Fração vulgar 1/2",frac34:"Fração vulgar 3/4",iquest:"Ponto de interrugação invertido",Agrave:"Letra maiúscula latina A com acento grave", -Aacute:"Letra maiúscula latina A com acento agudo",Acirc:"Letra maiúscula latina A com circunflexo",Atilde:"Letra maiúscula latina A com til",Auml:"Letra maiúscula latina A com trema",Aring:"Letra maiúscula latina A com sinal diacrítico",AElig:"Letra Maiúscula Latina Æ",Ccedil:"Letra maiúscula latina C com cedilha",Egrave:"Letra maiúscula latina E com acento grave",Eacute:"Letra maiúscula latina E com acento agudo",Ecirc:"Letra maiúscula latina E com circunflexo",Euml:"Letra maiúscula latina E com trema", +laquo:"Aspa esquerda ângulo duplo",not:"Não Símbolo",reg:"Símbolo de Registado",macr:"Mácron",deg:"Símbolo de Grau",sup2:"Expoente 2",sup3:"Expoente 3",acute:"Acento agudo",micro:"Símbolo de Micro",para:"Símbolo de Parágrafo",middot:"Ponto do Meio",cedil:"Cedilha",sup1:"Expoente 1",ordm:"Indicador ordinal masculino",raquo:"Aspas ângulo duplo pra Direita",frac14:"Fração vulgar 1/4",frac12:"Fração vulgar 1/2",frac34:"Fração vulgar 3/4",iquest:"Ponto de interrogação invertido",Agrave:"Letra maiúscula latina A com acento grave", +Aacute:"Letra maiúscula latina A com acento agudo",Acirc:"Letra maiúscula latina A com circunflexo",Atilde:"Letra maiúscula latina A com til",Auml:"Letra maiúscula latina A com trema",Aring:"Letra maiúscula latina A com sinal diacrítico",AElig:"Letra maiúscula latina Æ",Ccedil:"Letra maiúscula latina C com cedilha",Egrave:"Letra maiúscula latina E com acento grave",Eacute:"Letra maiúscula latina E com acento agudo",Ecirc:"Letra maiúscula latina E com circunflexo",Euml:"Letra maiúscula latina E com trema", Igrave:"Letra maiúscula latina I com acento grave",Iacute:"Letra maiúscula latina I com acento agudo",Icirc:"Letra maiúscula latina I com cincunflexo",Iuml:"Letra maiúscula latina I com trema",ETH:"Letra maiúscula latina Eth (Ðð)",Ntilde:"Letra maiúscula latina N com til",Ograve:"Letra maiúscula latina O com acento grave",Oacute:"Letra maiúscula latina O com acento agudo",Ocirc:"Letra maiúscula latina I com circunflexo",Otilde:"Letra maiúscula latina O com til",Ouml:"Letra maiúscula latina O com trema", -times:"Símbolo de Multiplicação",Oslash:"Letra maiúscula O com barra",Ugrave:"Letra maiúscula latina U com acento grave",Uacute:"Letra maiúscula latina U com acento agudo",Ucirc:"Letra maiúscula latina U com circunflexo",Uuml:"Letra maiúscula latina E com trema",Yacute:"Letra maiúscula latina Y com acento agudo",THORN:"Letra maiúscula latina Rúnico",szlig:"Letra minúscula latina s forte",agrave:"Letra minúscula latina a com acento grave",aacute:"Letra minúscula latina a com acento agudo",acirc:"Letra minúscula latina a com circunflexo", +times:"Símbolo de multiplicação",Oslash:"Letra maiúscula O com barra",Ugrave:"Letra maiúscula latina U com acento grave",Uacute:"Letra maiúscula latina U com acento agudo",Ucirc:"Letra maiúscula latina U com circunflexo",Uuml:"Letra maiúscula latina E com trema",Yacute:"Letra maiúscula latina Y com acento agudo",THORN:"Letra maiúscula latina Rúnico",szlig:"Letra minúscula latina s forte",agrave:"Letra minúscula latina a com acento grave",aacute:"Letra minúscula latina a com acento agudo",acirc:"Letra minúscula latina a com circunflexo", atilde:"Letra minúscula latina a com til",auml:"Letra minúscula latina a com trema",aring:"Letra minúscula latina a com sinal diacrítico",aelig:"Letra minúscula latina æ",ccedil:"Letra minúscula latina c com cedilha",egrave:"Letra minúscula latina e com acento grave",eacute:"Letra minúscula latina e com acento agudo",ecirc:"Letra minúscula latina e com circunflexo",euml:"Letra minúscula latina e com trema",igrave:"Letra minúscula latina i com acento grave",iacute:"Letra minúscula latina i com acento agudo", -icirc:"Letra minúscula latina i com circunflexo",iuml:"Letra pequena latina i com trema",eth:"Letra minúscula latina eth",ntilde:"Letra minúscula latina n com til",ograve:"Letra minúscula latina o com acento grave",oacute:"Letra minúscula latina o com acento agudo",ocirc:"Letra minúscula latina o com circunflexo",otilde:"Letra minúscula latina o com til",ouml:"Letra minúscula latina o com trema",divide:"Símbolo de Divisão",oslash:"Letra minúscula latina o com barra",ugrave:"Letra minúscula latina u com acento grave", +icirc:"Letra minúscula latina i com circunflexo",iuml:"Letra pequena latina i com trema",eth:"Letra minúscula latina eth",ntilde:"Letra minúscula latina n com til",ograve:"Letra minúscula latina o com acento grave",oacute:"Letra minúscula latina o com acento agudo",ocirc:"Letra minúscula latina o com circunflexo",otilde:"Letra minúscula latina o com til",ouml:"Letra minúscula latina o com trema",divide:"Símbolo de divisão",oslash:"Letra minúscula latina o com barra",ugrave:"Letra minúscula latina u com acento grave", uacute:"Letra minúscula latina u com acento agudo",ucirc:"Letra minúscula latina u com circunflexo",uuml:"Letra minúscula latina u com trema",yacute:"Letra minúscula latina y com acento agudo",thorn:"Letra minúscula latina Rúnico",yuml:"Letra minúscula latina y com trema",OElig:"Ligadura maiúscula latina OE",oelig:"Ligadura minúscula latina oe",372:"Letra maiúscula latina W com circunflexo",374:"Letra maiúscula latina Y com circunflexo",373:"Letra minúscula latina w com circunflexo",375:"Letra minúscula latina y com circunflexo", -sbquo:"Aspa Simples inferior-9",8219:"Aspa Simples superior invertida-9",bdquo:"Aspa Duplas inferior-9",hellip:"Elipse Horizontal ",trade:"Símbolo de Marca Registada",9658:"Ponteiro preto direito",bull:"Marca",rarr:"Seta para a direita",rArr:"Seta dupla para a direita",hArr:"Seta dupla direita esquerda",diams:"Naipe diamante preto",asymp:"Quase igual a "}); \ No newline at end of file +sbquo:"Aspa Simples inferior-9",8219:"Aspa Simples superior invertida-9",bdquo:"Aspa duplas inferior-9",hellip:"Elipse Horizontal ",trade:"Símbolo de Marca Registada",9658:"Ponteiro preto direito",bull:"Marca",rarr:"Seta para a direita",rArr:"Seta dupla para a direita",hArr:"Seta dupla direita esquerda",diams:"Naipe diamante preto",asymp:"Quase igual a "}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js index 866e86598e1..30633fdb79e 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","ru",{euro:"Знак евро",lsquo:"Левая одинарная кавычка",rsquo:"Правая одинарная кавычка",ldquo:"Левая двойная кавычка",rdquo:"Левая двойная кавычка",ndash:"Среднее тире",mdash:"Длинное тире",iexcl:"перевёрнутый восклицательный знак",cent:"Цент",pound:"Фунт",curren:"Знак валюты",yen:"Йена",brvbar:"Вертикальная черта с разрывом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак охраны авторского права",ordf:"Указатель окончания женского рода ...ая",laquo:"Левая кавычка-«ёлочка»", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js index 1255a35082f..12789fb55f2 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","si",{euro:"යුරෝ සලකුණ",lsquo:"වමේ තනි උපුටා දක්වීම ",rsquo:"දකුණේ තනි උපුටා දක්වීම ",ldquo:"වමේ දිත්ව උපුටා දක්වීම ",rdquo:"දකුණේ දිත්ව උපුටා දක්වීම ",ndash:"En dash",mdash:"Em dash",iexcl:"යටිකුරු හර්ෂදී ",cent:"Cent sign",pound:"Pound sign",curren:"මුල්‍යමය ",yen:"යෙන් ",brvbar:"Broken bar",sect:"තෙරේම් ",uml:"Diaeresis",copy:"පිටපත් අයිතිය ",ordf:"දර්ශකය",laquo:"Left-pointing double angle quotation mark",not:"සලකුණක් නොවේ",reg:"සලකුණක් ලියාපදිංචි කිරීම", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js index 2d226d06e8d..6e5b534aa2d 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","sk",{euro:"Znak eura",lsquo:"Ľavá jednoduchá úvodzovka",rsquo:"Pravá jednoduchá úvodzovka",ldquo:"Pravá dvojitá úvodzovka",rdquo:"Pravá dvojitá úvodzovka",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrátený výkričník",cent:"Znak centu",pound:"Znak libry",curren:"Znak meny",yen:"Znak jenu",brvbar:"Prerušená zvislá čiara",sect:"Znak odseku",uml:"Prehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených úvodzoviek vľavo",not:"Logistický zápor", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js index 84759b627f8..bdebbd12cbf 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Evro znak",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"En pomišljaj",mdash:"Em pomišljaj",iexcl:"Obrnjen klicaj",cent:"Cent znak",pound:"Funt znak",curren:"Znak valute",yen:"Jen znak",brvbar:"Zlomljena črta",sect:"Znak oddelka",uml:"Diaeresis",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi obrnjen dvojni kotni narekovaj",not:"Ne znak",reg:"Registrirani znak", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js index c7098005ca8..967a0484df3 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","sq",{euro:"Shenja e Euros",lsquo:"Thonjëza majtas me një vi",rsquo:"Thonjëza djathtas me një vi",ldquo:"Thonjëza majtas",rdquo:"Thonjëza djathtas",ndash:"En viza lidhëse",mdash:"Em viza lidhëse",iexcl:"Pikëçuditëse e përmbysur",cent:"Shenja e Centit",pound:"Shejna e Funtit",curren:"Shenja e valutës",yen:"Shenja e Jenit",brvbar:"Viza e këputur",sect:"Shenja e pjesës",uml:"Diaeresis",copy:"Shenja e të drejtave të kopjimit",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js index 8f741b93e59..d177c86b1a9 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","sv",{euro:"Eurotecken",lsquo:"Enkelt vänster citattecken",rsquo:"Enkelt höger citattecken",ldquo:"Dubbelt vänster citattecken",rdquo:"Dubbelt höger citattecken",ndash:"Snedstreck",mdash:"Långt tankstreck",iexcl:"Inverterad utropstecken",cent:"Centtecken",pound:"Pundtecken",curren:"Valutatecken",yen:"Yentecken",brvbar:"Brutet lodrätt streck",sect:"Paragraftecken",uml:"Diaeresis",copy:"Upphovsrättstecken",ordf:"Feminit ordningstalsindikator",laquo:"Vänsterställt dubbelt vinkelcitationstecken", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js index ae0b00e5373..1d43ac96f75 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","th",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"สัญลักษณ์สกุลเงิน",yen:"สัญลักษณ์เงินเยน",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js index 3dd220a3348..65c1a19c59d 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","tr",{euro:"Euro işareti",lsquo:"Sol tek tırnak işareti",rsquo:"Sağ tek tırnak işareti",ldquo:"Sol çift tırnak işareti",rdquo:"Sağ çift tırnak işareti",ndash:"En tire",mdash:"Em tire",iexcl:"Ters ünlem işareti",cent:"Cent işareti",pound:"Pound işareti",curren:"Para birimi işareti",yen:"Yen işareti",brvbar:"Kırık bar",sect:"Bölüm işareti",uml:"İki sesli harfin ayrılması",copy:"Telif hakkı işareti",ordf:"Dişil sıralı gösterge",laquo:"Sol-işaret çift açı tırnak işareti", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js new file mode 100644 index 00000000000..303d6554a23 --- /dev/null +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js @@ -0,0 +1,13 @@ +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.plugins.setLang("specialchar","tt",{euro:"Евро тамгасы",lsquo:"Сул бер иңле куштырнаклар",rsquo:"Уң бер иңле куштырнаклар",ldquo:"Сул ике иңле куштырнаклар",rdquo:"Уң ике иңле куштырнаклар",ndash:"Кыска сызык",mdash:"Озын сызык",iexcl:"Әйләндерелгән өндәү билгесе",cent:"Цент тамгасы",pound:"Фунт тамгасы",curren:"Акча берәмлеге тамгасы",yen:"Иена тамгасы",brvbar:"Broken bar",sect:"Параграф билгесе",uml:"Диерезис",copy:"Хокук иясе булу билгесе",ordf:"Feminine ordinal indicator",laquo:"Ачылучы чыршысыман җәя", +not:"Юклык ишарəсе",reg:"Теркәләнгән булу билгесе",macr:"Макрон",deg:"Градус билгесе",sup2:"Икенче өске индекс",sup3:"Өченче өске индекс",acute:"Басым билгесе",micro:"Микро билгесе",para:"Параграф билгесе",middot:"Уртадагы нокта",cedil:"Седиль",sup1:"Беренче өске индекс",ordm:"Masculine ordinal indicator",raquo:"Ябылучы чыршысыман җәя",frac14:"Гади дүрттән бер билгесе",frac12:"Гади икедән бер билгесе",frac34:"Гади дүрттән өч билгесе",iquest:"Әйләндерелгән өндәү билгесе",Agrave:"Гравис белән латин A баш хәрефе", +Aacute:"Басым билгесе белән латин A баш хәрефе",Acirc:"Циркумфлекс белән латин A баш хәрефе",Atilde:"Тильда белән латин A баш хәрефе",Auml:"Диерезис белән латин A баш хәрефе",Aring:"Өстендә боҗра булган латин A баш хәрефе",AElig:"Латин Æ баш хәрефе",Ccedil:"Седиль белән латин C баш хәрефе",Egrave:"Гравис белән латин E баш хәрефе",Eacute:"Басым билгесе белән латин E баш хәрефе",Ecirc:"Циркумфлекс белән латин E баш хәрефе",Euml:"Диерезис белән латин E баш хәрефе",Igrave:"Гравис белән латин I баш хәрефе", +Iacute:"Басым билгесе белән латин I баш хәрефе",Icirc:"Циркумфлекс белән латин I баш хәрефе",Iuml:"Диерезис белән латин I баш хәрефе",ETH:"Латин Eth баш хәрефе",Ntilde:"Тильда белән латин N баш хәрефе",Ograve:"Гравис белән латин O баш хәрефе",Oacute:"Басым билгесе белән латин O баш хәрефе",Ocirc:"Циркумфлекс белән латин O баш хәрефе",Otilde:"Тильда белән латин O баш хәрефе",Ouml:"Диерезис белән латин O баш хәрефе",times:"Тапкырлау билгесе",Oslash:"Сызык белән латин O баш хәрефе",Ugrave:"Гравис белән латин U баш хәрефе", +Uacute:"Басым билгесе белән латин U баш хәрефе",Ucirc:"Циркумфлекс белән латин U баш хәрефе",Uuml:"Диерезис белән латин U баш хәрефе",Yacute:"Басым билгесе белән латин Y баш хәрефе",THORN:"Латин Thorn баш хәрефе",szlig:"Латин beta юл хәрефе",agrave:"Гравис белән латин a юл хәрефе",aacute:"Басым билгесе белән латин a юл хәрефе",acirc:"Циркумфлекс белән латин a юл хәрефе",atilde:"Тильда белән латин a юл хәрефе",auml:"Диерезис белән латин a юл хәрефе",aring:"Өстендә боҗра булган латин a юл хәрефе",aelig:"Латин æ юл хәрефе", +ccedil:"Седиль белән латин c юл хәрефе",egrave:"Гравис белән латин e юл хәрефе",eacute:"Басым билгесе белән латин e юл хәрефе",ecirc:"Циркумфлекс белән латин e юл хәрефе",euml:"Диерезис белән латин e юл хәрефе",igrave:"Гравис белән латин i юл хәрефе",iacute:"Басым билгесе белән латин i юл хәрефе",icirc:"Циркумфлекс белән латин i юл хәрефе",iuml:"Диерезис белән латин i юл хәрефе",eth:"Латин eth юл хәрефе",ntilde:"Тильда белән латин n юл хәрефе",ograve:"Гравис белән латин o юл хәрефе",oacute:"Басым билгесе белән латин o юл хәрефе", +ocirc:"Циркумфлекс белән латин o юл хәрефе",otilde:"Тильда белән латин o юл хәрефе",ouml:"Диерезис белән латин o юл хәрефе",divide:"Бүлү билгесе",oslash:"Сызык белән латин o юл хәрефе",ugrave:"Гравис белән латин u юл хәрефе",uacute:"Басым билгесе белән латин u юл хәрефе",ucirc:"Циркумфлекс белән латин u юл хәрефе",uuml:"Диерезис белән латин u юл хәрефе",yacute:"Басым билгесе белән латин y юл хәрефе",thorn:"Латин thorn юл хәрефе",yuml:"Диерезис белән латин y юл хәрефе",OElig:"Латин лигатура OE баш хәрефе", +oelig:"Латин лигатура oe юл хәрефе",372:"Циркумфлекс белән латин W баш хәрефе",374:"Циркумфлекс белән латин Y баш хәрефе",373:"Циркумфлекс белән латин w юл хәрефе",375:"Циркумфлекс белән латин y юл хәрефе",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Ятма эллипс",trade:"Сәүдә маркасы билгесе",9658:"Black right-pointing pointer",bull:"Маркер",rarr:"Уң якка ук",rArr:"Уң якка икеләтә ук",hArr:"Ике якка икеләтә ук",diams:"Black diamond suit", +asymp:"якынча"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js index 51f4c1d93ef..757e83f65c6 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","ug",{euro:"ياۋرو بەلگىسى",lsquo:"يالاڭ پەش سول",rsquo:"يالاڭ پەش ئوڭ",ldquo:"قوش پەش سول",rdquo:"قوش پەش ئوڭ",ndash:"سىزىقچە",mdash:"سىزىق",iexcl:"ئۈندەش",cent:"تىيىن بەلگىسى",pound:"فوند ستېرلىڭ",curren:"پۇل بەلگىسى",yen:"ياپونىيە يىنى",brvbar:"ئۈزۈك بالداق",sect:"پاراگراف بەلگىسى",uml:"تاۋۇش ئايرىش بەلگىسى",copy:"نەشر ھوقۇقى بەلگىسى",ordf:"Feminine ordinal indicator",laquo:"قوش تىرناق سول",not:"غەيرى بەلگە",reg:"خەتلەتكەن تاۋار ماركىسى",macr:"سوزۇش بەلگىسى", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js index 845e7524bc7..2343e56b629 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","uk",{euro:"Знак євро",lsquo:"Ліві одинарні лапки",rsquo:"Праві одинарні лапки",ldquo:"Ліві подвійні лапки",rdquo:"Праві подвійні лапки",ndash:"Середнє тире",mdash:"Довге тире",iexcl:"Перевернутий знак оклику",cent:"Знак цента",pound:"Знак фунта",curren:"Знак валюти",yen:"Знак єни",brvbar:"Переривчаста вертикальна лінія",sect:"Знак параграфу",uml:"Умлаут",copy:"Знак авторських прав",ordf:"Жіночий порядковий вказівник",laquo:"ліві вказівні подвійні кутові дужки", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js index d4e4d37aad9..a71305b5b83 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","vi",{euro:"Ký hiệu Euro",lsquo:"Dấu ngoặc đơn trái",rsquo:"Dấu ngoặc đơn phải",ldquo:"Dấu ngoặc đôi trái",rdquo:"Dấu ngoặc đôi phải",ndash:"Gạch ngang tiếng anh",mdash:"Gạch ngang Em",iexcl:"Chuyển đổi dấu chấm than",cent:"Ký tự tiền Mỹ",pound:"Ký tự tiền Anh",curren:"Ký tự tiền tệ",yen:"Ký tự tiền Yên Nhật",brvbar:"Thanh hỏng",sect:"Ký tự khu vực",uml:"Dấu tách đôi",copy:"Ký tự bản quyền",ordf:"Phần chỉ thị giống cái",laquo:"Chọn dấu ngoặc đôi trái",not:"Không có ký tự", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js index 6896e91283d..d794a3daa78 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ CKEDITOR.plugins.setLang("specialchar","zh-cn",{euro:"欧元符号",lsquo:"左单引号",rsquo:"右单引号",ldquo:"左双引号",rdquo:"右双引号",ndash:"短划线",mdash:"长划线",iexcl:"竖翻叹号",cent:"分币符号",pound:"英镑符号",curren:"货币符号",yen:"日元符号",brvbar:"间断条",sect:"节标记",uml:"分音符",copy:"版权所有标记",ordf:"阴性顺序指示符",laquo:"左指双尖引号",not:"非标记",reg:"注册标记",macr:"长音符",deg:"度标记",sup2:"上标二",sup3:"上标三",acute:"锐音符",micro:"微符",para:"段落标记",middot:"中间点",cedil:"下加符",sup1:"上标一",ordm:"阳性顺序指示符",raquo:"右指双尖引号",frac14:"普通分数四分之一",frac12:"普通分数二分之一",frac34:"普通分数四分之三",iquest:"竖翻问号", diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js index 7bc2b556b56..cb135f9874b 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js @@ -1,12 +1,9 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"Broken bar",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"Micro sign",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"Vulgar fraction one half", -frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"拉丁大寫字母 E 帶分音符號",Aring:"拉丁大寫字母 A 帶上圓圈",AElig:"拉丁大寫字母 Æ",Ccedil:"拉丁大寫字母 C 帶下尾符號",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis", -Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis", -times:"乘號",Oslash:"拉丁大寫字母 O 帶粗線符號",Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde", -auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis", -eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex", -uuml:"Latin small letter u with diaeresis",yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark", -hellip:"Horizontal ellipsis",trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"}); \ No newline at end of file +CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"破折號",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"微",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"二分之一符號",frac34:"四分之三符號", +iquest:"倒置的問號",Agrave:"拉丁大寫字母 A 帶抑音符號",Aacute:"拉丁大寫字母 A 帶尖音符號",Acirc:"拉丁大寫字母 A 帶揚抑符",Atilde:"拉丁大寫字母 A 帶波浪號",Auml:"拉丁大寫字母 A 帶分音符號",Aring:"拉丁大寫字母 A 帶上圓圈",AElig:"拉丁大寫字母 Æ",Ccedil:"拉丁大寫字母 C 帶下尾符號",Egrave:"拉丁大寫字母 E 帶抑音符號",Eacute:"拉丁大寫字母 E 帶尖音符號",Ecirc:"拉丁大寫字母 E 帶揚抑符",Euml:"拉丁大寫字母 E 帶分音符號",Igrave:"拉丁大寫字母 I 帶抑音符號",Iacute:"拉丁大寫字母 I 帶尖音符號",Icirc:"拉丁大寫字母 I 帶揚抑符",Iuml:"拉丁大寫字母 I 帶分音符號",ETH:"拉丁大寫字母 Eth",Ntilde:"拉丁大寫字母 N 帶波浪號",Ograve:"拉丁大寫字母 O 帶抑音符號",Oacute:"拉丁大寫字母 O 帶尖音符號",Ocirc:"拉丁大寫字母 O 帶揚抑符",Otilde:"拉丁大寫字母 O 帶波浪號", +Ouml:"拉丁大寫字母 O 帶分音符號",times:"乘號",Oslash:"拉丁大寫字母 O 帶粗線符號",Ugrave:"拉丁大寫字母 U 帶抑音符號",Uacute:"拉丁大寫字母 U 帶尖音符號",Ucirc:"拉丁大寫字母 U 帶揚抑符",Uuml:"拉丁大寫字母 U 帶分音符號",Yacute:"拉丁大寫字母 Y 帶尖音符號",THORN:"拉丁大寫字母 Thorn",szlig:"拉丁小寫字母 s",agrave:"拉丁小寫字母 a 帶抑音符號",aacute:"拉丁小寫字母 a 帶尖音符號",acirc:"拉丁小寫字母 a 帶揚抑符",atilde:"拉丁小寫字母 a 帶波浪號",auml:"拉丁小寫字母 a 帶分音符號",aring:"拉丁小寫字母 a 帶上圓圈",aelig:"拉丁小寫字母 æ",ccedil:"拉丁小寫字母 c 帶下尾符號",egrave:"拉丁小寫字母 e 帶抑音符號",eacute:"拉丁小寫字母 e 帶尖音符號",ecirc:"拉丁小寫字母 e 帶揚抑符",euml:"拉丁小寫字母 e 帶分音符號",igrave:"拉丁小寫字母 i 帶抑音符號", +iacute:"拉丁小寫字母 i 帶尖音符號",icirc:"拉丁小寫字母 i 帶揚抑符",iuml:"拉丁小寫字母 i 帶分音符號",eth:"拉丁小寫字母 eth",ntilde:"拉丁小寫字母 n 帶波浪號",ograve:"拉丁小寫字母 o 帶抑音符號",oacute:"拉丁小寫字母 o 帶尖音符號",ocirc:"拉丁小寫字母 o 帶揚抑符",otilde:"拉丁小寫字母 o 帶波浪號",ouml:"拉丁小寫字母 o 帶分音符號",divide:"除號",oslash:"拉丁小寫字母 o 帶粗線符號",ugrave:"拉丁小寫字母 u 帶抑音符號",uacute:"拉丁小寫字母 u 帶尖音符號",ucirc:"拉丁小寫字母 u 帶揚抑符",uuml:"拉丁小寫字母 u 帶分音符號",yacute:"拉丁小寫字母 y 帶尖音符號",thorn:"拉丁小寫字母 thorn",yuml:"拉丁小寫字母 y 帶分音符號",OElig:"拉丁大寫字母 OE",oelig:"拉丁小寫字母 oe",372:"拉丁大寫字母 W 帶揚抑符",374:"拉丁大寫字母 Y 帶揚抑符",373:"拉丁小寫字母 w 帶揚抑符", +375:"拉丁小寫字母 y 帶揚抑符",sbquo:"低 9 單引號",8219:"高 9 反轉單引號",bdquo:"低 9 雙引號",hellip:"水平刪節號",trade:"商標符號",9658:"黑色向右指箭號",bull:"項目符號",rarr:"向右箭號",rArr:"向右雙箭號",hArr:"左右雙箭號",diams:"黑鑽套裝",asymp:"約等於"}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js index c4d1696b304..061cb450c26 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js @@ -1,14 +1,14 @@ /* - Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -CKEDITOR.dialog.add("specialchar",function(i){var e,l=i.lang.specialchar,k=function(c){var b,c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);if("a"==c.getName()&&(b=c.getChild(0).getHtml()))c.removeClass("cke_light_background"),e.hide(),c=i.document.createElement("span"),c.setHtml(b),i.insertText(c.getText())},m=CKEDITOR.tools.addFunction(k),j,g=function(c,b){var a,b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){j&&d(null,j); -var f=e.getContentElement("info","htmlPreview").getElement();e.getContentElement("info","charPreview").getElement().setHtml(a);f.setHtml(CKEDITOR.tools.htmlEncode(a));b.getParent().addClass("cke_light_background");j=b}},d=function(c,b){b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());"a"==b.getName()&&(e.getContentElement("info","charPreview").getElement().setHtml(" "),e.getContentElement("info","htmlPreview").getElement().setHtml(" "),b.getParent().removeClass("cke_light_background"), -j=void 0)},n=CKEDITOR.tools.addFunction(function(c){var c=new CKEDITOR.dom.event(c),b=c.getTarget(),a;a=c.getKeystroke();var f="rtl"==i.lang.dir;switch(a){case 38:if(a=b.getParent().getParent().getPrevious())a=a.getChild([b.getParent().getIndex(),0]),a.focus(),d(null,b),g(null,a);c.preventDefault();break;case 40:if(a=b.getParent().getParent().getNext())if((a=a.getChild([b.getParent().getIndex(),0]))&&1==a.type)a.focus(),d(null,b),g(null,a);c.preventDefault();break;case 32:k({data:c});c.preventDefault(); +CKEDITOR.dialog.add("specialchar",function(k){var e,n=k.lang.specialchar,m=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),e.hide(),c=k.document.createElement("span"),c.setHtml(b),k.insertText(c.getText()))},p=CKEDITOR.tools.addFunction(m),l,g=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){l&&d(null,l); +var f=e.getContentElement("info","htmlPreview").getElement();e.getContentElement("info","charPreview").getElement().setHtml(a);f.setHtml(CKEDITOR.tools.htmlEncode(a));b.getParent().addClass("cke_light_background");l=b}},d=function(c,b){b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());"a"==b.getName()&&(e.getContentElement("info","charPreview").getElement().setHtml("\x26nbsp;"),e.getContentElement("info","htmlPreview").getElement().setHtml("\x26nbsp;"),b.getParent().removeClass("cke_light_background"), +l=void 0)},q=CKEDITOR.tools.addFunction(function(c){c=new CKEDITOR.dom.event(c);var b=c.getTarget(),a;a=c.getKeystroke();var f="rtl"==k.lang.dir;switch(a){case 38:if(a=b.getParent().getParent().getPrevious())a=a.getChild([b.getParent().getIndex(),0]),a.focus(),d(null,b),g(null,a);c.preventDefault();break;case 40:(a=b.getParent().getParent().getNext())&&(a=a.getChild([b.getParent().getIndex(),0]))&&1==a.type&&(a.focus(),d(null,b),g(null,a));c.preventDefault();break;case 32:m({data:c});c.preventDefault(); break;case f?37:39:if(a=b.getParent().getNext())a=a.getChild(0),1==a.type?(a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):d(null,b);else if(a=b.getParent().getParent().getNext())(a=a.getChild([0,0]))&&1==a.type?(a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):d(null,b);break;case f?39:37:(a=b.getParent().getPrevious())?(a=a.getChild(0),a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):(a=b.getParent().getParent().getPrevious())?(a=a.getLast().getChild(0),a.focus(),d(null,b),g(null,a),c.preventDefault(!0)): -d(null,b)}});return{title:l.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){for(var c=this.definition.charColumns,b=i.config.specialChars,a=CKEDITOR.tools.getNextId()+"_specialchar_table_label",f=[''],d=0,g=b.length,h,e;d');for(var j=0;j'+h+''+e+"")}else f.push('")}f.push("")}f.push("
 ');f.push("
",''+l.options+"");this.getContentElement("info","charContainer").getElement().setHtml(f.join(""))},contents:[{id:"info",label:i.lang.common.generalTab, -title:i.lang.common.generalTab,padding:0,align:"top",elements:[{type:"hbox",align:"top",widths:["320px","90px"],children:[{type:"html",id:"charContainer",html:"",onMouseover:g,onMouseout:d,focus:function(){var c=this.getElement().getElementsByTag("a").getItem(0);setTimeout(function(){c.focus();g(null,c)},0)},onShow:function(){var c=this.getElement().getChild([0,0,0,0,0]);setTimeout(function(){c.focus();g(null,c)},0)},onLoad:function(c){e=c.sender}},{type:"hbox",align:"top",widths:["100%"],children:[{type:"vbox", -align:"top",children:[{type:"html",html:"
"},{type:"html",id:"charPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:"
 
"},{type:"html",id:"htmlPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;", -html:"
 
"}]}]}]}]}]}}); \ No newline at end of file +d(null,b)}});return{title:n.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){for(var c=this.definition.charColumns,b=k.config.specialChars,a=CKEDITOR.tools.getNextId()+"_specialchar_table_label",f=['\x3ctable role\x3d"listbox" aria-labelledby\x3d"'+a+'" style\x3d"width: 320px; height: 100%; border-collapse: separate;" align\x3d"center" cellspacing\x3d"2" cellpadding\x3d"2" border\x3d"0"\x3e'],d=0,g=b.length,h,e;dl&&(l=e)}return l}function o(a){return function(){var e=this.getValue(),e=!!(CKEDITOR.dialog.validate.integer()(e)&&0n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0n.getSize("width")?"100%":500:0,getValue:q,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&& -a.updateStyle("width",this.getValue())},setup:function(a){this.setValue(a.getStyle("width"))},commit:k}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:q,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles"); -a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:k}]},{type:"html",html:" "},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellSpacing", -this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]},{type:"html",align:"right", -html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0q.getSize("width")?"100%":500:0,getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&& +a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:m}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced", +"advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:m}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()? +d.setAttribute("cellSpacing",this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]}, +{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0"+h.widthPx}]},f,{type:"select",id:"wordWrap",label:c.wordWrap,"default":"yes",items:[[c.yes,"yes"],[c.no,"no"]],setup:d(function(a){var b=a.getAttribute("noWrap");if("nowrap"==a.getStyle("white-space")|| -b)return"no"}),commit:function(a){"no"==this.getValue()?a.setStyle("white-space","nowrap"):a.removeStyle("white-space");a.removeAttribute("noWrap")}},f,{type:"select",id:"hAlign",label:c.hAlign,"default":"",items:[[e.notSet,""],[e.alignLeft,"left"],[e.alignCenter,"center"],[e.alignRight,"right"]],setup:d(function(a){var b=a.getAttribute("align");return a.getStyle("text-align")||b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("text-align",b):a.removeStyle("text-align");a.removeAttribute("align")}}, -{type:"select",id:"vAlign",label:c.vAlign,"default":"",items:[[e.notSet,""],[e.alignTop,"top"],[e.alignMiddle,"middle"],[e.alignBottom,"bottom"],[c.alignBaseline,"baseline"]],setup:d(function(a){var b=a.getAttribute("vAlign"),a=a.getStyle("vertical-align");switch(a){case "top":case "middle":case "bottom":case "baseline":break;default:a=""}return a||b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("vertical-align",b):a.removeStyle("vertical-align");a.removeAttribute("vAlign")}}]},f,{type:"vbox", -padding:0,children:[{type:"select",id:"cellType",label:c.cellType,"default":"td",items:[[c.data,"td"],[c.header,"th"]],setup:d(function(a){return a.getName()}),commit:function(a){a.renameNode(this.getValue())}},f,{type:"text",id:"rowSpan",label:c.rowSpan,"default":"",validate:i.integer(c.invalidRowSpan),setup:d(function(a){if((a=parseInt(a.getAttribute("rowSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),10);b&&1!=b?a.setAttribute("rowSpan",this.getValue()):a.removeAttribute("rowSpan")}}, -{type:"text",id:"colSpan",label:c.colSpan,"default":"",validate:i.integer(c.invalidColSpan),setup:d(function(a){if((a=parseInt(a.getAttribute("colSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),10);b&&1!=b?a.setAttribute("colSpan",this.getValue()):a.removeAttribute("colSpan")}},f,{type:"hbox",padding:0,widths:["60%","40%"],children:[{type:"text",id:"bgColor",label:c.bgColor,"default":"",setup:d(function(a){var b=a.getAttribute("bgColor");return a.getStyle("background-color")|| -b}),commit:function(a){this.getValue()?a.setStyle("background-color",this.getValue()):a.removeStyle("background-color");a.removeAttribute("bgColor")}},k?{type:"button",id:"bgColorChoose","class":"colorChooser",label:c.chooseColor,onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){g.getColorFromDialog(function(a){a&&this.getDialog().getContentElement("info","bgColor").setValue(a);this.focus()},this)}}:f]},f,{type:"hbox",padding:0,widths:["60%","40%"], -children:[{type:"text",id:"borderColor",label:c.borderColor,"default":"",setup:d(function(a){var b=a.getAttribute("borderColor");return a.getStyle("border-color")||b}),commit:function(a){this.getValue()?a.setStyle("border-color",this.getValue()):a.removeStyle("border-color");a.removeAttribute("borderColor")}},k?{type:"button",id:"borderColorChoose","class":"colorChooser",label:c.chooseColor,style:(m?"margin-right":"margin-left")+": 10px",onLoad:function(){this.getElement().getParent().setStyle("vertical-align", +CKEDITOR.dialog.add("cellProperties",function(g){function d(a){return function(b){for(var c=a(b[0]),d=1;d
'),d='';a.image&&b&&(d+='');d+='");k.on("click",function(){p(a.html)});return k}function p(a){var b=CKEDITOR.dialog.getCurrent();b.getValueOf("selectTpl","chkInsertOpt")?(c.fire("saveSnapshot"),c.setData(a,function(){b.hide();var a=c.createRange();a.moveToElementEditStart(c.editable());a.select();setTimeout(function(){c.fire("saveSnapshot")},0)})):(c.insertHtml(a),b.hide())}function i(a){var b=a.data.getTarget(), -c=g.equals(b);if(c||g.contains(b)){var d=a.data.getKeystroke(),f=g.getElementsByTag("a"),e;if(f){if(c)e=f.getItem(0);else switch(d){case 40:e=b.getNext();break;case 38:e=b.getPrevious();break;case 13:case 32:b.fire("click")}e&&(e.focus(),a.data.preventDefault())}}}var h=CKEDITOR.plugins.get("templates");CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(h.path+"dialogs/templates.css"));var g,h="cke_tpl_list_label_"+CKEDITOR.tools.getNextNumber(),f=c.lang.templates,l=c.config;return{title:c.lang.templates.title, -minWidth:CKEDITOR.env.ie?440:400,minHeight:340,contents:[{id:"selectTpl",label:f.title,elements:[{type:"vbox",padding:5,children:[{id:"selectTplText",type:"html",html:""+f.selectPromptMsg+""},{id:"templatesList",type:"html",focus:!0,html:'
'+f.options+""},{id:"chkInsertOpt",type:"checkbox",label:f.insertOption, -"default":l.templates_replaceContent}]}]}],buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var a=this.getContentElement("selectTpl","templatesList");g=a.getElement();CKEDITOR.loadTemplates(l.templates_files,function(){var b=(l.templates||"default").split(",");if(b.length){var c=g;c.setHtml("");for(var d=0,h=b.length;d'+f.emptyListMsg+"")});this._.element.on("keydown",i)},onHide:function(){this._.element.removeListener("keydown",i)}}})})(); \ No newline at end of file +(function(){CKEDITOR.dialog.add("templates",function(c){function r(a,b){var m=CKEDITOR.dom.element.createFromHtml('\x3ca href\x3d"javascript:void(0)" tabIndex\x3d"-1" role\x3d"option" \x3e\x3cdiv class\x3d"cke_tpl_item"\x3e\x3c/div\x3e\x3c/a\x3e'),d='\x3ctable style\x3d"width:350px;" class\x3d"cke_tpl_preview" role\x3d"presentation"\x3e\x3ctr\x3e';a.image&&b&&(d+='\x3ctd class\x3d"cke_tpl_preview_img"\x3e\x3cimg src\x3d"'+CKEDITOR.getUrl(b+a.image)+'"'+(CKEDITOR.env.ie6Compat?' onload\x3d"this.width\x3dthis.width"': +"")+' alt\x3d"" title\x3d""\x3e\x3c/td\x3e');d+='\x3ctd style\x3d"white-space:normal;"\x3e\x3cspan class\x3d"cke_tpl_title"\x3e'+a.title+"\x3c/span\x3e\x3cbr/\x3e";a.description&&(d+="\x3cspan\x3e"+a.description+"\x3c/span\x3e");d+="\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e";m.getFirst().setHtml(d);m.on("click",function(){t(a.html)});return m}function t(a){var b=CKEDITOR.dialog.getCurrent();b.getValueOf("selectTpl","chkInsertOpt")?(c.fire("saveSnapshot"),c.setData(a,function(){b.hide();var a=c.createRange(); +a.moveToElementEditStart(c.editable());a.select();setTimeout(function(){c.fire("saveSnapshot")},0)})):(c.insertHtml(a),b.hide())}function k(a){var b=a.data.getTarget(),c=g.equals(b);if(c||g.contains(b)){var d=a.data.getKeystroke(),f=g.getElementsByTag("a"),e;if(f){if(c)e=f.getItem(0);else switch(d){case 40:e=b.getNext();break;case 38:e=b.getPrevious();break;case 13:case 32:b.fire("click")}e&&(e.focus(),a.data.preventDefault())}}}var h=CKEDITOR.plugins.get("templates");CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(h.path+ +"dialogs/templates.css"));var g,h="cke_tpl_list_label_"+CKEDITOR.tools.getNextNumber(),f=c.lang.templates,n=c.config;return{title:c.lang.templates.title,minWidth:CKEDITOR.env.ie?440:400,minHeight:340,contents:[{id:"selectTpl",label:f.title,elements:[{type:"vbox",padding:5,children:[{id:"selectTplText",type:"html",html:"\x3cspan\x3e"+f.selectPromptMsg+"\x3c/span\x3e"},{id:"templatesList",type:"html",focus:!0,html:'\x3cdiv class\x3d"cke_tpl_list" tabIndex\x3d"-1" role\x3d"listbox" aria-labelledby\x3d"'+ +h+'"\x3e\x3cdiv class\x3d"cke_tpl_loading"\x3e\x3cspan\x3e\x3c/span\x3e\x3c/div\x3e\x3c/div\x3e\x3cspan class\x3d"cke_voice_label" id\x3d"'+h+'"\x3e'+f.options+"\x3c/span\x3e"},{id:"chkInsertOpt",type:"checkbox",label:f.insertOption,"default":n.templates_replaceContent}]}]}],buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var a=this.getContentElement("selectTpl","templatesList");g=a.getElement();CKEDITOR.loadTemplates(n.templates_files,function(){var b=(n.templates||"default").split(","); +if(b.length){var c=g;c.setHtml("");for(var d=0,h=b.length;dType the title here

Type the text here

'},{title:"Strange Template",image:"template2.gif",description:"A template that defines two colums, each one with a title, and some text.", -html:'

Title 1

Title 2

Text 1Text 2

More text goes here.

'},{title:"Text and Table",image:"template3.gif",description:"A title with some text and a table.",html:'

Title goes here

Table title
   
   
   

Type the text here

'}]}); \ No newline at end of file +CKEDITOR.addTemplates("default",{imagesPath:CKEDITOR.getUrl(CKEDITOR.plugins.getPath("templates")+"templates/images/"),templates:[{title:"Image and Title",image:"template1.gif",description:"One main image with a title and text that surround the image.",html:'\x3ch3\x3e\x3cimg src\x3d" " alt\x3d"" style\x3d"margin-right: 10px" height\x3d"100" width\x3d"100" align\x3d"left" /\x3eType the title here\x3c/h3\x3e\x3cp\x3eType the text here\x3c/p\x3e'},{title:"Strange Template",image:"template2.gif",description:"A template that defines two colums, each one with a title, and some text.", +html:'\x3ctable cellspacing\x3d"0" cellpadding\x3d"0" style\x3d"width:100%" border\x3d"0"\x3e\x3ctr\x3e\x3ctd style\x3d"width:50%"\x3e\x3ch3\x3eTitle 1\x3c/h3\x3e\x3c/td\x3e\x3ctd\x3e\x3c/td\x3e\x3ctd style\x3d"width:50%"\x3e\x3ch3\x3eTitle 2\x3c/h3\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3eText 1\x3c/td\x3e\x3ctd\x3e\x3c/td\x3e\x3ctd\x3eText 2\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3cp\x3eMore text goes here.\x3c/p\x3e'},{title:"Text and Table",image:"template3.gif",description:"A title with some text and a table.", +html:'\x3cdiv style\x3d"width: 80%"\x3e\x3ch3\x3eTitle goes here\x3c/h3\x3e\x3ctable style\x3d"width:150px;float: right" cellspacing\x3d"0" cellpadding\x3d"0" border\x3d"1"\x3e\x3ccaption style\x3d"border:solid 1px black"\x3e\x3cstrong\x3eTable title\x3c/strong\x3e\x3c/caption\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3ctd\x3e\x26nbsp;\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3cp\x3eType the text here\x3c/p\x3e\x3c/div\x3e'}]}); \ No newline at end of file diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html index 25db3c739fd..5809fbefe91 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html +++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/ciframe.html @@ -1,6 +1,6 @@ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmp.html b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmp.html deleted file mode 100644 index 67642956f37..00000000000 --- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmp.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - - iframe - - - - -
- - - - - - - diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html index 0d675f4d692..d5fc6bba4e6 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html +++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/tmpFrameset.html @@ -1,6 +1,6 @@ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css index 9e834f1d094..1056b45f24b 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css +++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.css @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js index 22410bdb155..5ef1d391f3e 100644 --- a/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js +++ b/htdocs/includes/ckeditor/ckeditor/plugins/wsc/dialogs/wsc.js @@ -1,67 +1,92 @@ /* - Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ -(function(){function w(a){if(!a)throw"Languages-by-groups list are required for construct selectbox";var c=[],d="",f;for(f in a)for(var g in a[f]){var h=a[f][g];"en_US"==h?d=h:c.push(h)}c.sort();d&&c.unshift(d);return{getCurrentLangGroup:function(c){a:{for(var d in a)for(var f in a[d])if(f.toUpperCase()===c.toUpperCase()){c=d;break a}c=""}return c},setLangList:function(){var c={},d;for(d in a)for(var f in a[d])c[a[d][f]]=f;return c}()}}var e=function(){var a=function(a,b,f){var f=f||{},g=f.expires; -if("number"==typeof g&&g){var h=new Date;h.setTime(h.getTime()+1E3*g);g=f.expires=h}g&&g.toUTCString&&(f.expires=g.toUTCString());var b=encodeURIComponent(b),a=a+"="+b,e;for(e in f)b=f[e],a+="; "+e,!0!==b&&(a+="="+b);document.cookie=a};return{postMessage:{init:function(a){document.addEventListener?window.addEventListener("message",a,!1):window.attachEvent("onmessage",a)},send:function(a){var b=a.fn||null,f=a.id||"",g=a.target||window,h=a.message||{id:f};"[object Object]"==Object.prototype.toString.call(a.message)&& -(a.message.id||(a.message.id=f),h=a.message);a=window.JSON.stringify(h,b);g.postMessage(a,"*")}},hash:{create:function(){},parse:function(){}},cookie:{set:a,get:function(a){return(a=document.cookie.match(RegExp("(?:^|; )"+a.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g,"\\$1")+"=([^;]*)")))?decodeURIComponent(a[1]):void 0},remove:function(c){a(c,"",{expires:-1})}}}}(),a=a||{};a.TextAreaNumber=null;a.load=!0;a.cmd={SpellTab:"spell",Thesaurus:"thes",GrammTab:"grammar"};a.dialog=null;a.optionNode=null;a.selectNode= -null;a.grammerSuggest=null;a.textNode={};a.iframeMain=null;a.dataTemp="";a.div_overlay=null;a.textNodeInfo={};a.selectNode={};a.selectNodeResponce={};a.langList=null;a.langSelectbox=null;a.banner="";a.show_grammar=null;a.div_overlay_no_check=null;a.targetFromFrame={};a.onLoadOverlay=null;a.LocalizationComing={};a.OverlayPlace=null;a.LocalizationButton={ChangeTo:{instance:null,text:"Change to"},ChangeAll:{instance:null,text:"Change All"},IgnoreWord:{instance:null,text:"Ignore word"},IgnoreAllWords:{instance:null, -text:"Ignore all words"},Options:{instance:null,text:"Options",optionsDialog:{instance:null}},AddWord:{instance:null,text:"Add word"},FinishChecking:{instance:null,text:"Finish Checking"}};a.LocalizationLabel={ChangeTo:{instance:null,text:"Change to"},Suggestions:{instance:null,text:"Suggestions"}};var x=function(b){for(var c in b)b[c].instance.getElement().setText(a.LocalizationComing[c])},y=function(b){for(var c in b){if(!b[c].instance.setLabel)break;b[c].instance.setLabel(a.LocalizationComing[c])}}, -j,p;a.framesetHtml=function(b){return''};a.setIframe=function(b,c){var d=a.framesetHtml(c);return b.getElement().setHtml(d)};a.setCurrentIframe=function(b){a.setIframe(a.dialog._.contents[b].Content,b)};a.setHeightBannerFrame=function(){var b=a.dialog.getContentElement("SpellTab","banner").getElement(), -c=a.dialog.getContentElement("GrammTab","banner").getElement(),d=a.dialog.getContentElement("Thesaurus","banner").getElement();b.setStyle("height","90px");c.setStyle("height","90px");d.setStyle("height","90px")};a.setHeightFrame=function(){document.getElementById(a.iframeNumber+"_"+a.dialog._.currentTabId).style.height="240px"};a.sendData=function(b){var c=b._.currentTabId,d=b._.contents[c].Content,f,g;a.setIframe(d,c);b.parts.tabs.removeAllListeners();b.parts.tabs.on("click",function(h){h=h||window.event; -h.data.getTarget().is("a")&&c!=b._.currentTabId&&(c=b._.currentTabId,d=b._.contents[c].Content,f=a.iframeNumber+"_"+c,a.div_overlay.setEnable(),d.getElement().getChildCount()?t(a.targetFromFrame[f],a.cmd[c]):(a.setIframe(d,c),g=document.getElementById(f),a.targetFromFrame[f]=g.contentWindow))})};a.buildSelectLang=function(a){var c=new CKEDITOR.dom.element("div"),d=new CKEDITOR.dom.element("select"),a="wscLang"+a;c.addClass("cke_dialog_ui_input_select");c.setAttribute("role","presentation");c.setStyles({height:"auto", -position:"absolute",right:"0",top:"-1px",width:"160px","white-space":"normal"});d.setAttribute("id",a);d.addClass("cke_dialog_ui_input_select");d.setStyles({width:"160px"});c.append(d);return c};a.buildOptionLang=function(b,c){var d=document.getElementById("wscLang"+c),f=document.createDocumentFragment(),g,h,e=[];if(0===d.options.length){for(g in b)e.push([g,b[g]]);e.sort();for(var k=0;k"},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(b){var b=a.iframeNumber+"_"+b._.currentTabId, -c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"hbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",widths:["50%","50%"],children:[{type:"hbox",id:"leftCol",align:"left",width:"50%",children:[{type:"vbox",id:"rightCol1",widths:["50%","50%"],children:[{type:"text",id:"text",label:a.LocalizationLabel.ChangeTo.text+":",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",width:"140px","default":"",onShow:function(){a.textNode.SpellTab=this;a.LocalizationLabel.ChangeTo.instance= -this},onHide:function(){this.reset()}},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"text",id:"labelSuggestions",label:a.LocalizationLabel.Suggestions.text+":",onShow:function(){a.LocalizationLabel.Suggestions.instance=this;this.getInputElement().hide()}},{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src= -a.logotype;this.getElement().getParent().setStyles({"text-align":"left"})}}]},{type:"select",id:"list_of_suggestions",labelStyle:"font: 12px/25px arial, sans-serif;",size:"6",inputStyle:"width: 140px; height: auto;",items:[["loading..."]],onShow:function(){p=this},onHide:function(){this.clear()},onChange:function(){a.textNode.SpellTab.setValue(this.getValue())}}]}]}]},{type:"hbox",id:"rightCol",align:"right",width:"50%",children:[{type:"vbox",id:"rightCol_col__left",widths:["50%","50%","50%","50%"], -children:[{type:"button",id:"ChangeTo",label:a.LocalizationButton.ChangeTo.text,title:"Change to",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.ChangeTo.instance=this},onClick:c},{type:"button",id:"ChangeAll",label:a.LocalizationButton.ChangeAll.text,title:"Change All",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.ChangeAll.instance=this},onClick:c},{type:"button",id:"AddWord", -label:a.LocalizationButton.AddWord.text,title:"Add word",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.AddWord.instance=this},onClick:c},{type:"button",id:"FinishChecking",label:a.LocalizationButton.FinishChecking.text,title:"Finish Checking",style:"width: 100%;margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.FinishChecking.instance=this},onClick:c}]},{type:"vbox",id:"rightCol_col__right", -widths:["50%","50%","50%"],children:[{type:"button",id:"IgnoreWord",label:a.LocalizationButton.IgnoreWord.text,title:"Ignore word",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.IgnoreWord.instance=this},onClick:c},{type:"button",id:"IgnoreAllWords",label:a.LocalizationButton.IgnoreAllWords.text,title:"Ignore all words",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.IgnoreAllWords.instance= -this},onClick:c},{type:"button",id:"option",label:a.LocalizationButton.Options.text,title:"Option",style:"width: 100%;",onLoad:function(){a.LocalizationButton.Options.instance=this;"file:"==document.location.protocol&&this.disable()},onClick:function(){"file:"==document.location.protocol?alert("WSC: Options functionality is disabled when runing from file system"):b.openDialog("options")}}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;",widths:["70%","30%"],onShow:function(){this.getElement().hide()}, -onHide:l,children:[{type:"hbox",id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",setup:function(){this.getChild()[0].getElement().$.src=a.logotype;this.getChild()[0].getElement().getParent().setStyles({"text-align":"center"})},children:[{type:"html",id:"logo",html:'WebSpellChecker.net'}]}]},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox", -id:"rightCol_col__left",children:[{type:"button",id:"Option_button",label:a.LocalizationButton.Options.text,title:"Option",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);"file:"==document.location.protocol&&this.disable()},onClick:function(){"file:"==document.location.protocol?alert("WSC: Options functionality is disabled when runing from file system"):b.openDialog("options")}},{type:"button",id:"FinishChecking",label:a.LocalizationButton.FinishChecking.text, -title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]},{id:"GrammTab",label:"Grammar",accessKey:"G",elements:[{type:"html",id:"banner",label:"banner",style:"",html:"
"},{type:"html",id:"Content",label:"GrammarContent",html:"",setup:function(){var b=a.iframeNumber+"_"+a.dialog._.currentTabId,c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"vbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;", -children:[{type:"hbox",id:"leftCol",widths:["66%","34%"],children:[{type:"vbox",children:[{type:"text",id:"text",label:"Change to:",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",inputStyle:"float: right; width: 200px;","default":"",onShow:function(){a.textNode.GrammTab=this},onHide:function(){this.reset()}},{type:"html",id:"html_text",html:"
", -onShow:function(){a.textNodeInfo.GrammTab=this}},{type:"html",id:"radio",html:"",onShow:function(){a.grammerSuggest=this}}]},{type:"vbox",children:[{type:"button",id:"ChangeTo",label:"Change to",title:"Change to",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c},{type:"button",id:"IgnoreWord",label:"Ignore word",title:"Ignore word",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)}, -onClick:c},{type:"button",id:"IgnoreAllWords",label:"Ignore Problem",title:"Ignore Problem",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c},{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 133px; float: right; margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;", -widths:["70%","30%"],onShow:function(){this.getElement().hide()},onHide:l,children:[{type:"hbox",id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",children:[{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}}]}]},{type:"hbox",id:"rightCol",align:"right", -width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]},{id:"Thesaurus",label:"Thesaurus",accessKey:"T",elements:[{type:"html",id:"banner",label:"banner",style:"",html:"
"},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(){var b=a.iframeNumber+"_"+a.dialog._.currentTabId, -c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"vbox",id:"bottomGroup",style:"width:560px; margin: -10px auto; overflow: hidden;",children:[{type:"hbox",widths:["75%","25%"],children:[{type:"vbox",children:[{type:"hbox",widths:["65%","35%"],children:[{type:"text",id:"ChangeTo",label:"Change to:",labelLayout:"horizontal",inputStyle:"width: 160px;",labelStyle:"font: 12px/25px arial, sans-serif;","default":"",onShow:function(){a.textNode.Thesaurus=this},onHide:function(){this.reset()}}, -{type:"button",id:"ChangeTo",label:"Change to",title:"Change to",style:"width: 121px; margin-top: 1px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]},{type:"hbox",children:[{type:"select",id:"categories",label:"Categories:",labelStyle:"font: 12px/25px arial, sans-serif;",size:"5",inputStyle:"width: 180px; height: auto;",items:[],onShow:function(){a.selectNode.categories=this},onHide:function(){this.clear()},onChange:function(){a.buildOptionSynonyms(this.getValue())}}, -{type:"select",id:"synonyms",label:"Synonyms:",labelStyle:"font: 12px/25px arial, sans-serif;",size:"5",inputStyle:"width: 180px; height: auto;",items:[],onShow:function(){a.selectNode.synonyms=this;a.textNode.Thesaurus.setValue(this.getValue())},onHide:function(){this.clear()},onChange:function(){a.textNode.Thesaurus.setValue(this.getValue())}}]}]},{type:"vbox",width:"120px",style:"margin-top:46px;",children:[{type:"html",id:"logotype",label:"WebSpellChecker.net",html:'WebSpellChecker.net', -setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}},{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 121px; float: right; margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;",widths:["70%","30%"],onShow:function(){this.getElement().hide()},children:[{type:"hbox", -id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",children:[{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}}]}]},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"button",id:"FinishChecking", -label:"Finish Checking",title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]}]}});CKEDITOR.dialog.add("options",function(){var b=null,c={},d={},f=null,g=null;e.cookie.get("udn");e.cookie.get("osp");var h=function(){g=this.getElement().getAttribute("title-cmd");var a=[];a[0]=d.IgnoreAllCapsWords;a[1]=d.IgnoreWordsNumbers;a[2]=d.IgnoreMixedCaseWords;a[3]=d.IgnoreDomainNames;a=a.toString().replace(/,/g,"");e.cookie.set("osp", -a);e.cookie.set("udnCmd",g?g:"ignore");"delete"!=g&&(a="",""!==j.getValue()&&(a=j.getValue()),e.cookie.set("udn",a));e.postMessage.send({id:"options_dic_send"})},i=function(){f.getElement().setHtml(a.LocalizationComing.error);f.getElement().show()};return{title:a.LocalizationComing.Options,minWidth:430,minHeight:130,resizable:CKEDITOR.DIALOG_RESIZE_NONE,contents:[{id:"OptionsTab",label:"Options",accessKey:"O",elements:[{type:"hbox",id:"options_error",children:[{type:"html",style:"display: block;text-align: center;white-space: normal!important; font-size: 12px;color:red", -html:"
",onShow:function(){f=this}}]},{type:"vbox",id:"Options_content",children:[{type:"hbox",id:"Options_manager",widths:["52%","48%"],children:[{type:"fieldset",label:"Spell Checking Options",style:"border: none;margin-top: 13px;padding: 10px 0 10px 10px",onShow:function(){this.getInputElement().$.children[0].innerHTML=a.LocalizationComing.SpellCheckingOptions},children:[{type:"vbox",id:"Options_checkbox",children:[{type:"checkbox",id:"IgnoreAllCapsWords",label:"Ignore All-Caps Words", -labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox",id:"IgnoreWordsNumbers",label:"Ignore Words with Numbers",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox", -id:"IgnoreMixedCaseWords",label:"Ignore Mixed-Case Words",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox",id:"IgnoreDomainNames",label:"Ignore Domain Names",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]= -!this.getValue()?0:1}}]}]},{type:"vbox",id:"Options_DictionaryName",children:[{type:"text",id:"DictionaryName",style:"margin-bottom: 10px",label:"Dictionary Name:",labelLayout:"vertical",labelStyle:"font: 12px/25px arial, sans-serif;","default":"",onLoad:function(){j=this;this.setValue(a.userDictionaryName?a.userDictionaryName:(e.cookie.get("udn"),this.getValue()))},onShow:function(){j=this;this.setValue(!e.cookie.get("udn")?this.getValue():e.cookie.get("udn"));this.setLabel(a.LocalizationComing.DictionaryName)}, -onHide:function(){this.reset()}},{type:"hbox",id:"Options_buttons",children:[{type:"vbox",id:"Options_leftCol_col",widths:["50%","50%"],children:[{type:"button",id:"create",label:"Create",title:"Create",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Create)},onClick:h},{type:"button",id:"restore",label:"Restore",title:"Restore",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd", -this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Restore)},onClick:h}]},{type:"vbox",id:"Options_rightCol_col",widths:["50%","50%"],children:[{type:"button",id:"rename",label:"Rename",title:"Rename",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Rename)},onClick:h},{type:"button",id:"delete",label:"Remove",title:"Remove",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd", -this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Remove)},onClick:h}]}]}]}]},{type:"hbox",id:"Options_text",children:[{type:"html",style:"text-align: justify;margin-top: 15px;white-space: normal!important; font-size: 12px;color:#777;",html:"
"+a.LocalizationComing.OptionsTextIntro+"
",onShow:function(){this.getElement().setText(a.LocalizationComing.OptionsTextIntro)}}]}]}]}],buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton],onOk:function(){var a=[]; -a[0]=d.IgnoreAllCapsWords;a[1]=d.IgnoreWordsNumbers;a[2]=d.IgnoreMixedCaseWords;a[3]=d.IgnoreDomainNames;a=a.toString().replace(/,/g,"");e.cookie.set("osp",a);e.cookie.set("udn",j.getValue());e.postMessage.send({id:"options_checkbox_send"});f.getElement().hide();f.getElement().setHtml(" ")},onLoad:function(){b=this;e.postMessage.init(i);c.IgnoreAllCapsWords=b.getContentElement("OptionsTab","IgnoreAllCapsWords");c.IgnoreWordsNumbers=b.getContentElement("OptionsTab","IgnoreWordsNumbers");c.IgnoreMixedCaseWords= -b.getContentElement("OptionsTab","IgnoreMixedCaseWords");c.IgnoreDomainNames=b.getContentElement("OptionsTab","IgnoreDomainNames")},onShow:function(){var b=e.cookie.get("osp").split("");d.IgnoreAllCapsWords=b[0];d.IgnoreWordsNumbers=b[1];d.IgnoreMixedCaseWords=b[2];d.IgnoreDomainNames=b[3];!parseInt(d.IgnoreAllCapsWords,10)?c.IgnoreAllCapsWords.setValue("",!1):c.IgnoreAllCapsWords.setValue("checked",!1);!parseInt(d.IgnoreWordsNumbers,10)?c.IgnoreWordsNumbers.setValue("",!1):c.IgnoreWordsNumbers.setValue("checked", -!1);!parseInt(d.IgnoreMixedCaseWords,10)?c.IgnoreMixedCaseWords.setValue("",!1):c.IgnoreMixedCaseWords.setValue("checked",!1);!parseInt(d.IgnoreDomainNames,10)?c.IgnoreDomainNames.setValue("",!1):c.IgnoreDomainNames.setValue("checked",!1);d.IgnoreAllCapsWords=!c.IgnoreAllCapsWords.getValue()?0:1;d.IgnoreWordsNumbers=!c.IgnoreWordsNumbers.getValue()?0:1;d.IgnoreMixedCaseWords=!c.IgnoreMixedCaseWords.getValue()?0:1;d.IgnoreDomainNames=!c.IgnoreDomainNames.getValue()?0:1;c.IgnoreAllCapsWords.getElement().$.lastChild.innerHTML= -a.LocalizationComing.IgnoreAllCapsWords;c.IgnoreWordsNumbers.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreWordsWithNumbers;c.IgnoreMixedCaseWords.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreMixedCaseWords;c.IgnoreDomainNames.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreDomainNames}}});CKEDITOR.dialog.on("resize",function(b){var b=b.data,c=b.dialog,d=CKEDITOR.document.getById(a.iframeNumber+"_"+c._.currentTabId);"checkspell"==c._.name&&(a.bnr?d&& -d.setSize("height",b.height-310):d&&d.setSize("height",b.height-220))});CKEDITOR.on("dialogDefinition",function(b){var c=b.data.definition;a.onLoadOverlay=new q({opacity:"1",background:"#fff",target:c.dialog.parts.tabs.getParent().$});a.onLoadOverlay.setEnable();c.dialog.on("show",function(){});c.dialog.on("cancel",function(){c.dialog.getParentEditor().config.wsc_onClose.call(this.document.getWindow().getFrame());a.div_overlay.setDisable();return!1},this,null,-1)})})(); \ No newline at end of file +(function(){function z(a){return a&&a.domId&&a.getInputElement().$?a.getInputElement():a&&a.$?a:!1}function I(a){if(!a)throw"Languages-by-groups list are required for construct selectbox";var c=[],e="",d;for(d in a)for(var f in a[d]){var h=a[d][f];"en_US"==h?e=h:c.push(h)}c.sort();e&&c.unshift(e);return{getCurrentLangGroup:function(c){a:{for(var d in a)for(var e in a[d])if(e.toUpperCase()===c.toUpperCase()){c=d;break a}c=""}return c},setLangList:function(){var c={},d;for(d in a)for(var e in a[d])c[a[d][e]]= +e;return c}()}}var g=function(){var a=function(a,b,d){d=d||{};var f=d.expires;if("number"==typeof f&&f){var h=new Date;h.setTime(h.getTime()+1E3*f);f=d.expires=h}f&&f.toUTCString&&(d.expires=f.toUTCString());b=encodeURIComponent(b);a=a+"\x3d"+b;for(var k in d)b=d[k],a+="; "+k,!0!==b&&(a+="\x3d"+b);document.cookie=a};return{postMessage:{init:function(a){window.addEventListener?window.addEventListener("message",a,!1):window.attachEvent("onmessage",a)},send:function(a){var b=Object.prototype.toString, +d=a.fn||null,f=a.id||"",h=a.target||window,k=a.message||{id:f};a.message&&"[object Object]"==b.call(a.message)&&(a.message.id?a.message.id:a.message.id=f,k=a.message);a=window.JSON.stringify(k,d);h.postMessage(a,"*")},unbindHandler:function(a){window.removeEventListener?window.removeEventListener("message",a,!1):window.detachEvent("onmessage",a)}},hash:{create:function(){},parse:function(){}},cookie:{set:a,get:function(a){return(a=document.cookie.match(new RegExp("(?:^|; )"+a.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, +"\\$1")+"\x3d([^;]*)")))?decodeURIComponent(a[1]):void 0},remove:function(c){a(c,"",{expires:-1})}},misc:{findFocusable:function(a){var b=null;a&&(b=a.find("a[href], area[href], input, select, textarea, button, *[tabindex], *[contenteditable]"));return b},isVisible:function(a){var b;(b=0===a.offsetWidth||0==a.offsetHeight)||(b="none"===(document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(a,null).display:a.currentStyle?a.currentStyle.display:a.style.display)); +return!b},hasClass:function(a,b){return!(!a.className||!a.className.match(new RegExp("(\\s|^)"+b+"(\\s|$)")))}}}}(),a=a||{};a.TextAreaNumber=null;a.load=!0;a.cmd={SpellTab:"spell",Thesaurus:"thes",GrammTab:"grammar"};a.dialog=null;a.optionNode=null;a.selectNode=null;a.grammerSuggest=null;a.textNode={};a.iframeMain=null;a.dataTemp="";a.div_overlay=null;a.textNodeInfo={};a.selectNode={};a.selectNodeResponce={};a.langList=null;a.langSelectbox=null;a.banner="";a.show_grammar=null;a.div_overlay_no_check= +null;a.targetFromFrame={};a.onLoadOverlay=null;a.LocalizationComing={};a.OverlayPlace=null;a.sessionid="";a.LocalizationButton={ChangeTo_button:{instance:null,text:"Change to",localizationID:"ChangeTo"},ChangeAll:{instance:null,text:"Change All"},IgnoreWord:{instance:null,text:"Ignore word"},IgnoreAllWords:{instance:null,text:"Ignore all words"},Options:{instance:null,text:"Options",optionsDialog:{instance:null}},AddWord:{instance:null,text:"Add word"},FinishChecking_button:{instance:null,text:"Finish Checking", +localizationID:"FinishChecking"},FinishChecking_button_block:{instance:null,text:"Finish Checking",localizationID:"FinishChecking"}};a.LocalizationLabel={ChangeTo_label:{instance:null,text:"Change to",localizationID:"ChangeTo"},Suggestions:{instance:null,text:"Suggestions"},Categories:{instance:null,text:"Categories"},Synonyms:{instance:null,text:"Synonyms"}};var J=function(b){var c,e,d;for(d in b)c=(c=a.dialog.getContentElement(a.dialog._.currentTabId,d))?c.getElement():b[d].instance.getElement().getFirst()|| +b[d].instance.getElement(),e=b[d].localizationID||d,c.setText(a.LocalizationComing[e])},K=function(b){var c,e,d;for(d in b)c=a.dialog.getContentElement(a.dialog._.currentTabId,d),c||(c=b[d].instance),c.setLabel&&(e=b[d].localizationID||d,c.setLabel(a.LocalizationComing[e]+":"))},r,A;a.framesetHtml=function(b){return"\x3ciframe id\x3d"+a.iframeNumber+"_"+b+' frameborder\x3d"0" allowtransparency\x3d"1" style\x3d"width:100%;border: 1px solid #AEB3B9;overflow: auto;background:#fff; border-radius: 3px;"\x3e\x3c/iframe\x3e'}; +a.setIframe=function(b,c){var e;e=a.framesetHtml(c);var d=a.iframeNumber+"_"+c;b.getElement().setHtml(e);e=document.getElementById(d);e=e.contentWindow?e.contentWindow:e.contentDocument.document?e.contentDocument.document:e.contentDocument;e.document.open();e.document.write('\x3c!DOCTYPE html\x3e\x3chtml\x3e\x3chead\x3e\x3cmeta charset\x3d"UTF-8"\x3e\x3ctitle\x3eiframe\x3c/title\x3e\x3cstyle\x3ehtml,body{margin: 0;height: 100%;font: 13px/1.555 "Trebuchet MS", sans-serif;}a{color: #888;font-weight: bold;text-decoration: none;border-bottom: 1px solid #888;}.main-box {color:#252525;padding: 3px 5px;text-align: justify;}.main-box p{margin: 0 0 14px;}.main-box .cerr{color: #f00000;border-bottom-color: #f00000;}\x3c/style\x3e\x3c/head\x3e\x3cbody\x3e\x3cdiv id\x3d"content" class\x3d"main-box"\x3e\x3c/div\x3e\x3ciframe src\x3d"" frameborder\x3d"0" id\x3d"spelltext" name\x3d"spelltext" style\x3d"display:none; width: 100%" \x3e\x3c/iframe\x3e\x3ciframe src\x3d"" frameborder\x3d"0" id\x3d"loadsuggestfirst" name\x3d"loadsuggestfirst" style\x3d"display:none; width: 100%" \x3e\x3c/iframe\x3e\x3ciframe src\x3d"" frameborder\x3d"0" id\x3d"loadspellsuggestall" name\x3d"loadspellsuggestall" style\x3d"display:none; width: 100%" \x3e\x3c/iframe\x3e\x3ciframe src\x3d"" frameborder\x3d"0" id\x3d"loadOptionsForm" name\x3d"loadOptionsForm" style\x3d"display:none; width: 100%" \x3e\x3c/iframe\x3e\x3cscript\x3e(function(window) {var ManagerPostMessage \x3d function() {var _init \x3d function(handler) {if (document.addEventListener) {window.addEventListener("message", handler, false);} else {window.attachEvent("onmessage", handler);};};var _sendCmd \x3d function(o) {var str,type \x3d Object.prototype.toString,fn \x3d o.fn || null,id \x3d o.id || "",target \x3d o.target || window,message \x3d o.message || { "id": id };if (o.message \x26\x26 type.call(o.message) \x3d\x3d "[object Object]") {(o.message["id"]) ? o.message["id"] : o.message["id"] \x3d id;message \x3d o.message;};str \x3d JSON.stringify(message, fn);target.postMessage(str, "*");};return {init: _init,send: _sendCmd};};var manageMessageTmp \x3d new ManagerPostMessage;var appString \x3d (function(){var spell \x3d parent.CKEDITOR.config.wsc.DefaultParams.scriptPath;var serverUrl \x3d parent.CKEDITOR.config.wsc.DefaultParams.serviceHost;return serverUrl + spell;})();function loadScript(src, callback) {var scriptTag \x3d document.createElement("script");scriptTag.type \x3d "text/javascript";callback ? callback : callback \x3d function() {};if(scriptTag.readyState) {scriptTag.onreadystatechange \x3d function() {if (scriptTag.readyState \x3d\x3d "loaded" ||scriptTag.readyState \x3d\x3d "complete") {scriptTag.onreadystatechange \x3d null;setTimeout(function(){scriptTag.parentNode.removeChild(scriptTag)},1);callback();}};}else{scriptTag.onload \x3d function() {setTimeout(function(){scriptTag.parentNode.removeChild(scriptTag)},1);callback();};};scriptTag.src \x3d src;document.getElementsByTagName("head")[0].appendChild(scriptTag);};window.onload \x3d function(){loadScript(appString, function(){manageMessageTmp.send({"id": "iframeOnload","target": window.parent});});}})(this);\x3c/script\x3e\x3c/body\x3e\x3c/html\x3e'); +e.document.close()};a.setCurrentIframe=function(b){a.setIframe(a.dialog._.contents[b].Content,b)};a.setHeightBannerFrame=function(){var b=a.dialog.getContentElement("SpellTab","banner").getElement(),c=a.dialog.getContentElement("GrammTab","banner").getElement(),e=a.dialog.getContentElement("Thesaurus","banner").getElement();b.setStyle("height","90px");c.setStyle("height","90px");e.setStyle("height","90px")};a.setHeightFrame=function(){document.getElementById(a.iframeNumber+"_"+a.dialog._.currentTabId).style.height= +"240px"};a.sendData=function(b){var c=b._.currentTabId,e=b._.contents[c].Content,d,f;a.previousTab=c;a.setIframe(e,c);var h=function(h){c=b._.currentTabId;h=h||window.event;h.data.getTarget().is("a")&&c!==a.previousTab&&(a.previousTab=c,e=b._.contents[c].Content,d=a.iframeNumber+"_"+c,a.div_overlay.setEnable(),e.getElement().getChildCount()?E(a.targetFromFrame[d],a.cmd[c]):(a.setIframe(e,c),f=document.getElementById(d),a.targetFromFrame[d]=f.contentWindow))};b.parts.tabs.removeListener("click",h); +b.parts.tabs.on("click",h)};a.buildSelectLang=function(a){var c=new CKEDITOR.dom.element("div"),e=new CKEDITOR.dom.element("select");a="wscLang"+a;c.addClass("cke_dialog_ui_input_select");c.setAttribute("role","presentation");c.setStyles({height:"auto",position:"absolute",right:"0",top:"-1px",width:"160px","white-space":"normal"});e.setAttribute("id",a);e.addClass("cke_dialog_ui_input_select");e.setStyles({width:"160px"});c.append(e);return c};a.buildOptionLang=function(b,c){var e=document.getElementById("wscLang"+ +c),d=document.createDocumentFragment(),f,h,k=[];if(0===e.options.length){for(f in b)k.push([f,b[f]]);k.sort();for(var p=0;pm.width-D&&(e=m.width-D);if(gm.height-q&&(g=m.height-q);n.width=e+D;n.height=g+q;a._.fromResizeEvent=!1;a.resize(e,g);setTimeout(function(){a._.fromResizeEvent=!1;CKEDITOR.dialog.fire("resize",{dialog:a,width:e,height:g},b)},300)}a._.moved||(q=isNaN(c)&&isNaN(d)?0:1,isNaN(c)&&(c=(m.width-n.width)/2),0>c&&(c=0),c>m.width-n.width&&(c=m.width-n.width),isNaN(d)&&(d=(m.height-n.height)/2),0>d&&(d=0),d>m.height-n.height&&(d=m.height-n.height),a.move(c, +d,q))}function e(){b.wsc={};(function(a){var b={separator:"\x3c$\x3e",getDataType:function(a){return"undefined"===typeof a?"undefined":null===a?"null":Object.prototype.toString.call(a).slice(8,-1)},convertDataToString:function(a){return this.getDataType(a).toLowerCase()+this.separator+a},restoreDataFromString:function(a){var b=a,c;a=this.backCompatibility(a);if("string"===typeof a)switch(b=a.indexOf(this.separator),c=a.substring(0,b),b=a.substring(b+this.separator.length),c){case "boolean":b="true"=== +b;break;case "number":b=parseFloat(b);break;case "array":b=""===b?[]:b.split(",");break;case "null":b=null;break;case "undefined":b=void 0}return b},backCompatibility:function(a){var b=a,c;"string"===typeof a&&(c=a.indexOf(this.separator),0>c&&(b=parseFloat(a),isNaN(b)&&("["===a[0]&&"]"===a[a.length-1]?(a=a.replace("[",""),a=a.replace("]",""),b=""===a?[]:a.split(",")):b="true"===a||"false"===a?"true"===a:a),b=this.convertDataToString(b)));return b}},c={get:function(a){return b.restoreDataFromString(window.localStorage.getItem(a))}, +set:function(a,c){var d=b.convertDataToString(c);window.localStorage.setItem(a,d)},del:function(a){window.localStorage.removeItem(a)},clear:function(){window.localStorage.clear()}},d={expiration:31622400,get:function(a){return b.restoreDataFromString(this.getCookie(a))},set:function(a,c){var d=b.convertDataToString(c);this.setCookie(a,d,{expires:this.expiration})},del:function(a){this.deleteCookie(a)},getCookie:function(a){return(a=document.cookie.match(new RegExp("(?:^|; )"+a.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, +"\\$1")+"\x3d([^;]*)")))?decodeURIComponent(a[1]):void 0},setCookie:function(a,b,c){c=c||{};var d=c.expires;if("number"===typeof d&&d){var e=new Date;e.setTime(e.getTime()+1E3*d);d=c.expires=e}d&&d.toUTCString&&(c.expires=d.toUTCString());b=encodeURIComponent(b);a=a+"\x3d"+b;for(var h in c)b=c[h],a+="; "+h,!0!==b&&(a+="\x3d"+b);document.cookie=a},deleteCookie:function(a){this.setCookie(a,null,{expires:-1})},clear:function(){for(var a=document.cookie.split(";"),b=0;b