(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index f99138abc34b2e2bb6791421ce99c674714a1211..39713b53694a8158ec4348cb40a14d8d2864340d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -211,7 +211,7 @@ class wsAjax extends cubeAjax {
 \r
                $datas = array();\r
                foreach ($_POST['group'] as $gid => $group) {\r
-                       if ($gid && $gid == '_new') {\r
+                       if ($gid && $gid == 'new_') {\r
                                continue;\r
                        }\r
 \r
@@ -223,7 +223,7 @@ class wsAjax extends cubeAjax {
                                }\r
                                $group['publications'] = $publications;\r
                        } else {\r
-                               $group['publications'] = array($dao->_emptyPublication);\r
+                               $group['publications'] = array($dao->_emptyPublication());\r
                        }\r
 \r
                        $datas[] = $group;\r
@@ -231,13 +231,11 @@ class wsAjax extends cubeAjax {
                if (count($datas) == 0) {\r
                        $datas = $dao->_emptyCollection();\r
                }\r
-               \r
-               fb($datas);\r
-               \r
+\r
                $save['datas'] = $datas;\r
                $dao->sauve($save);\r
 \r
-               //$x->addReload();\r
+               $x->addReload();\r
        }\r
 \r
        public static function changeBookProprietaire($args, &$x) {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 231f6cc78219638f99b8302f63e8320a702adb9a..78c057d241b205d4ae38c0b00c9b15e350cf9e50 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -252,7 +252,7 @@ class wsUrl {
                        if ($gid && $gid == 'new_') {\r
                                $class.=' empty';\r
                        }\r
-                       $res.='<li class="' . $class . '">';\r
+                       $res.='<li class="' . $class . '" data-group="' . $gid . '">';\r
                        $res.='<div class="g">';\r
                        $res.='<a href="#" class="move"></a>';\r
                        $g = 'group[' . $gid . ']';\r
@@ -261,17 +261,23 @@ class wsUrl {
                        $res.='</div>';\r
                        $res.='<ul>';\r
                        $res.='<li style="height:2px;"></li>';\r
-                       foreach ($group['publications'] as $pid => $publication) {\r
-                               $p = $g . '[publication][' . $pid . ']';\r
-                               $res.='<li class="publication"><div>';\r
+\r
+                       $publications = array_values($group['publications']);\r
+                       foreach ($publications as $pid => $publication) {\r
+                               if ($gid && $gid == 'new_') {\r
+                                       $pid = 'pnew_';\r
+                               }\r
+                               $p = $g . '[publications][' . $pid . ']';\r
+                               $res.='<li class="publication" data-publication="' . $pid . '"><div>';\r
                                if (isset($books[$publication['id']])) {\r
                                        $book = $books[$publication['id']];\r
                                } else {\r
                                        $book = new stdClass();\r
                                        $book->lang = '';\r
+                                       $book->nom = '';\r
                                }\r
                                $res.='<a href="#" class="move"></a>';\r
-                               $res.=mb_strtoupper($book->lang);\r
+                               $res.='<span class="lang">' . mb_strtoupper($book->lang) . '</span>';\r
                                $res.='<span class="id"># ' . form::field(array($p . '[s]'), 64, 256, trim($publication['id'] . ' - ' . $book->nom, ' -'), 'publication_id') . form::hidden(array($p . '[id]'), $publication['id']) . '</span>';\r
                                $res.='<span class="label">' . __('Label') . ' ' . form::field(array($p . '[label]'), 20, 64, $publication['label']) . '</span>';\r
                                $res.='<a href="#" class="delete"></a>';\r
@@ -293,7 +299,7 @@ class wsUrl {
                global $core;\r
 \r
                cubePage::truePopup();\r
-               \r
+\r
                $droits = wsDroits::getDroits();\r
 \r
                commonDroits::min(3);\r
@@ -351,8 +357,6 @@ class wsUrl {
                        $res .= '<tr' . $odd . '><td colspan="7">';\r
                        $res .= commonPage::pager($settings['page'], $dao->count($core->user), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('collections'), false);\r
-\r
-\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -1904,12 +1908,12 @@ html{height:100%}' . "\n";
                        $res .= '<table>';\r
                        $res .= '<tr><th class="left" colspan="2">' . __("Détails de la demande") . '</th><th class="left" style="width:40%">' . __('Votre action') . '</th></tr>';\r
                        $res .= '<tr><td>' . __('Numéro de demande') . '</td><td>' . $demande->demande_id . '</td>';\r
-                       $res .= '<td>' . '<a href="#" class="ajax" rel="reponseDemande/' . $demande_id . '/' . $revendeur_id . '/1" >' . cubeMedia::cssRollover($core->typo->BookTelecharger(__('Accepter la demande'), '', false)) . '</a>' . '</td></tr>';\r
+                       $res .= '<td>' . '<a href="#" class="ajax download btbook" rel="reponseDemande/' . $demande_id . '/' . $revendeur_id . '/1" ><div></div><span>' . __('Accepter la demande') . '</span></a>' . '</td></tr>';\r
                        $res .= '<tr><td>' . __('Date de la demande') . '</td><td>' . date(__('d/m/Y H:i'), $demande->date) . '</td></tr>';\r
                        $res .= '</tr>';\r
                        $res .= '<tr><td>' . __('Client') . ' / ' . __('Prospect') . '</td><td><a href="#" class="popup" rel="formClient/' . $demande->entreprise . '">' . $demande->utilisateur_nom . '</a></td></tr>';\r
                        $res .= '<tr><td>' . __('Nombre de pages') . '</td><td>' . $demande->pages . '</td>';\r
-                       $res .= '<td>' . '<a href="#" class="ajax" rel="reponseDemande/' . $demande_id . '/' . $revendeur_id . '/0">' . cubeMedia::cssRollover($core->typo->Supprimer(__('Décliner la demande'), '', false)) . '</a>' . '</td>';\r
+                       $res .= '<td>' . '<a href="#" class="ajax suppr btbook" rel="reponseDemande/' . $demande_id . '/' . $revendeur_id . '/0"><div></div><span>' . __('Décliner la demande') . '</span></a>' . '</td>';\r
                        $res .='</tr>';\r
                        $res .= '<tr><td>' . __('Nombre de liens') . '</td><td>' . $demande->liens . '</td></tr>';\r
                        $res .= '<tr><td>' . __('Nombre de langues') . '</td><td>' . $demande->langues . '</td></tr>';\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f0fbdaaceee42ad0265b335174b1b3f5e8f47168..c347a36b57f6e1a97591b5b448c9ee1adc93bf92 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1072,8 +1072,6 @@ class wsDAOBook extends commonDAO {
                $daoLang = new wsDAOLang($this->con);\r
                $lang = $daoLang->selectById($book->lang);\r
 \r
-               fb($lang);\r
-\r
                $langs = $daoLang->selectAll();\r
 \r
                $daoTheme = new wsDAOTheme($this->con);\r
@@ -1093,7 +1091,7 @@ class wsDAOBook extends commonDAO {
                $hash = $book_id;\r
                $hash .= 'kjgl!az4.';\r
                $hash .= count($pages);\r
-               $hash .= round($size[0], 4);\r
+               $hash .= round($size[0], 3);\r
 \r
                $hash = sha1($hash);\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 55d98f1caec758aa29dffd2773188184e49bda25..c4a46c11a4bd74a847fd9e1a2761550231f79fa5 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -145,7 +145,7 @@ class wsDAODocument extends commonDAO {
                                $links[$p['document_id']] = array();\r
                                $rulers[$p['document_id']] = array();\r
                        }\r
-                       \r
+\r
                        if (!isset($links[$p['document_id']][$p['document_page']])) {\r
                                $links[$p['document_id']][$p['document_page']] = array();\r
                                $rulers[$p['document_id']][$p['document_page']] = array();\r
@@ -178,8 +178,6 @@ class wsDAODocument extends commonDAO {
                        }\r
                }\r
 \r
-               fb($links);\r
-\r
                foreach ($links as $document_id => $dummy) {\r
                        wsLinks::setDocumentLinks($document_id, json_encode($links[$document_id]), json_encode($rulers[$document_id]), $user, $comments, TIME);\r
                }\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index fb4528a496a9a4292079dfbd5fefa5d4808c1861..b48666afccb0e95c59131f1a31642d70475f6643 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -237,9 +237,10 @@ class wsBookParametres extends wsParametres {
                $this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);\r
                $this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),\r
                        'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',\r
-                               __('Grdf') => 'com.fluidbook.player.basket.custom.grdf.GrdfBasketManager',\r
-                               __('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager',\r
-                               __('Essilor Recap') => 'com.fluidbook.player.basket.cursor.essilorrecap.EssilorRecapBasketManager'), 'grade' => 5);\r
+                               'Grdf' => 'com.fluidbook.player.basket.custom.grdf.GrdfBasketManager',\r
+                               'Grdf 2013' => 'com.fluidbook.player.basket.custom.grdf.grdf2013.GrdfBasketManager2013',\r
+                               'Essilor' => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager',\r
+                               'Essilor Recap' => 'com.fluidbook.player.basket.cursor.essilorrecap.EssilorRecapBasketManager'), 'grade' => 5);\r
                $this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');\r
                $this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r

diff --git a/js/ws.js b/js/ws.js
index 93b895b85e215203761f0db533e97bf251d96d04..006164ea52173f62a7bcf98eb988a13b0f235d5a 100644 (file)
--- a/js/ws.js
+++ b/js/ws.js
@@ -17,8 +17,23 @@ function load_ws_once() {
                });\r
 \r
 \r
-               $("#collection>form>ul a.delete").click(function() {\r
+               $(document).on('click', "#collection>form>ul a.delete", function() {\r
                        $(this).parents('li:first').remove();\r
+                       return false;\r
+               });\r
+\r
+               $(document).on('click', "#collection>form>ul a.add", function() {\r
+                       var publication = $(this).parents('li:first');\r
+                       var group = $(publication).parents('.group');\r
+                       var clone = $(".group.empty .publication").clone().get(0).outerHTML;\r
+\r
+                       clone = clone.replace(/pnew_/gi, $(group).find('.publication').length);\r
+                       clone = clone.replace(/new_/gi, $(group).data('group'));\r
+\r
+                       $(publication).after(clone);\r
+\r
+                       initAutocompleteCollection();\r
+                       return false;\r
                });\r
 \r
                $("#collection>form>ul>li").each(function() {\r
@@ -31,6 +46,7 @@ function load_ws_once() {
                $("#newGroup").click(function() {\r
                        var g = $(".group.empty").clone();\r
                        var html = g.get(0).outerHTML;\r
+                       html = html.replace(/pnew_/gi, '0');\r
                        html = html.replace(/new_/gi, "new_" + newCounter);\r
                        g = $(html);\r
                        $(g).removeClass('empty');\r
@@ -52,17 +68,20 @@ function initGroup(group) {
                connectWith: '#collection>form>ul ul'\r
        });\r
 \r
+       initAutocompleteCollection();\r
+}\r
+\r
+function initAutocompleteCollection() {\r
        try {\r
-               $('.publication_id').autocompletej(SITE_PATH + 'autocomplete/book', {\r
+               $('.publication_id:visible').not('.ac_input').autocompletej(SITE_PATH + 'autocomplete/book', {\r
                        cacheLength: 0,\r
                        maxItemsToShow: 15,\r
                        onFindValue: findBook,\r
                        onItemSelect: findBook\r
                });\r
        } catch (err) {\r
-               fb(err);\r
-       }\r
 \r
+       }\r
 }\r
 \r
 function load_ws() {\r
@@ -146,6 +165,9 @@ function findBook(li) {
        if (book.length <= 1) {\r
                return;\r
        }\r
+\r
        var book_id = parseInt(book[0]);\r
-       $(this.input).next('input[type="hidden"]:first').val(book_id);\r
+       var next = $(this.input).next('input[type="hidden"]:first');\r
+       fb(this.input);\r
+       $(next).val(book_id);\r
 }
\ No newline at end of file

diff --git a/style/ws/style.css b/style/ws/style.css
index 7f044f3fd145a4d83bf3b2371e65089e178b891f..0bcf1ad5e6aa53279bb73acd226ff62873334849 100644 (file)
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -50,7 +50,7 @@ input[type="text"],input[type="password"],input[type="email"],input[type="search
 .big .content{width:1210px;}\r
 \r
 .liste .bouton a{\r
-       height:26px;\r
+       height:16px;\r
 }\r
 \r
 #header{\r
@@ -517,7 +517,7 @@ th.stats_col{
        margin:5px 0 10px 0;\r
 }\r
 \r
-.liste .bouton a.btbook{\r
+a.btbook{\r
        display:inline-block;\r
        height:16px;\r
        padding:2px 6px 2px 2px;\r
@@ -547,40 +547,39 @@ th.stats_col{
        box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
 }\r
 \r
-.liste .bouton a.btbook>div{\r
+a.btbook>div{\r
        display:inline-block;\r
        width:16px;\r
        height:16px;\r
        background-position: 0 0;\r
 }\r
 \r
-.liste .bouton a.btbook>span{\r
+a.btbook>span{\r
        display:inline-block;\r
        vertical-align: top;\r
        margin:0 0 0 5px;\r
 }\r
 \r
-.liste .bouton a.btbook:hover>div{\r
+a.btbook:hover>div{\r
        background-position: 0 100%;\r
 }\r
 \r
-.liste .bouton a.btbook.suppr>div{\r
+a.btbook.suppr>div{\r
        background-image: url("../../images/ws/btdel.png");\r
 }\r
 \r
-.liste .bouton a.btbook.voir>div{\r
+a.btbook.voir>div{\r
        background-image: url("../../images/ws/btview.png");\r
 }\r
 \r
-.liste .bouton a.btbook.download>div{\r
+a.btbook.download>div{\r
        background-image: url("../../images/ws/btdownload.png");\r
 }\r
 \r
-.liste .bouton a.btbook.stats>div{\r
+a.btbook.stats>div{\r
        background-image: url("../../images/ws/btstats.png");\r
 }\r
-\r
-.liste .bouton a.btbook.edit>div{\r
+a.btbook.edit>div{\r
        background-image: url("../../images/ws/btedit.png");\r
 }\r
 \r