From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 18 Feb 2013 17:14:08 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=45a2c2fd331b0b08007c58a046f4c4a6226f83d0;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index f99138abc..39713b536 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -211,7 +211,7 @@ class wsAjax extends cubeAjax {
 
 		$datas = array();
 		foreach ($_POST['group'] as $gid => $group) {
-			if ($gid && $gid == '_new') {
+			if ($gid && $gid == 'new_') {
 				continue;
 			}
 
@@ -223,7 +223,7 @@ class wsAjax extends cubeAjax {
 				}
 				$group['publications'] = $publications;
 			} else {
-				$group['publications'] = array($dao->_emptyPublication);
+				$group['publications'] = array($dao->_emptyPublication());
 			}
 
 			$datas[] = $group;
@@ -231,13 +231,11 @@ class wsAjax extends cubeAjax {
 		if (count($datas) == 0) {
 			$datas = $dao->_emptyCollection();
 		}
-		
-		fb($datas);
-		
+
 		$save['datas'] = $datas;
 		$dao->sauve($save);
 
-		//$x->addReload();
+		$x->addReload();
 	}
 
 	public static function changeBookProprietaire($args, &$x) {
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 231f6cc78..78c057d24 100644
--- 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_') {
 				$class.=' empty';
 			}
-			$res.='<li class="' . $class . '">';
+			$res.='<li class="' . $class . '" data-group="' . $gid . '">';
 			$res.='<div class="g">';
 			$res.='<a href="#" class="move"></a>';
 			$g = 'group[' . $gid . ']';
@@ -261,17 +261,23 @@ class wsUrl {
 			$res.='</div>';
 			$res.='<ul>';
 			$res.='<li style="height:2px;"></li>';
-			foreach ($group['publications'] as $pid => $publication) {
-				$p = $g . '[publication][' . $pid . ']';
-				$res.='<li class="publication"><div>';
+
+			$publications = array_values($group['publications']);
+			foreach ($publications as $pid => $publication) {
+				if ($gid && $gid == 'new_') {
+					$pid = 'pnew_';
+				}
+				$p = $g . '[publications][' . $pid . ']';
+				$res.='<li class="publication" data-publication="' . $pid . '"><div>';
 				if (isset($books[$publication['id']])) {
 					$book = $books[$publication['id']];
 				} else {
 					$book = new stdClass();
 					$book->lang = '';
+					$book->nom = '';
 				}
 				$res.='<a href="#" class="move"></a>';
-				$res.=mb_strtoupper($book->lang);
+				$res.='<span class="lang">' . mb_strtoupper($book->lang) . '</span>';
 				$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>';
 				$res.='<span class="label">' . __('Label') . ' ' . form::field(array($p . '[label]'), 20, 64, $publication['label']) . '</span>';
 				$res.='<a href="#" class="delete"></a>';
@@ -293,7 +299,7 @@ class wsUrl {
 		global $core;
 
 		cubePage::truePopup();
-		
+
 		$droits = wsDroits::getDroits();
 
 		commonDroits::min(3);
@@ -351,8 +357,6 @@ class wsUrl {
 			$res .= '<tr' . $odd . '><td colspan="7">';
 			$res .= commonPage::pager($settings['page'], $dao->count($core->user), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('collections'), false);
-
-
 			$res .= '</td></tr>';
 		}
 		$res .= '</table>';
@@ -1904,12 +1908,12 @@ html{height:100%}' . "\n";
 			$res .= '<table>';
 			$res .= '<tr><th class="left" colspan="2">' . __("Détails de la demande") . '</th><th class="left" style="width:40%">' . __('Votre action') . '</th></tr>';
 			$res .= '<tr><td>' . __('Numéro de demande') . '</td><td>' . $demande->demande_id . '</td>';
-			$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>';
+			$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>';
 			$res .= '<tr><td>' . __('Date de la demande') . '</td><td>' . date(__('d/m/Y H:i'), $demande->date) . '</td></tr>';
 			$res .= '</tr>';
 			$res .= '<tr><td>' . __('Client') . ' / ' . __('Prospect') . '</td><td><a href="#" class="popup" rel="formClient/' . $demande->entreprise . '">' . $demande->utilisateur_nom . '</a></td></tr>';
 			$res .= '<tr><td>' . __('Nombre de pages') . '</td><td>' . $demande->pages . '</td>';
-			$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>';
+			$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>';
 			$res .='</tr>';
 			$res .= '<tr><td>' . __('Nombre de liens') . '</td><td>' . $demande->liens . '</td></tr>';
 			$res .= '<tr><td>' . __('Nombre de langues') . '</td><td>' . $demande->langues . '</td></tr>';
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f0fbdaace..c347a36b5 100644
--- 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);
 		$lang = $daoLang->selectById($book->lang);
 
-		fb($lang);
-
 		$langs = $daoLang->selectAll();
 
 		$daoTheme = new wsDAOTheme($this->con);
@@ -1093,7 +1091,7 @@ class wsDAOBook extends commonDAO {
 		$hash = $book_id;
 		$hash .= 'kjgl!az4.';
 		$hash .= count($pages);
-		$hash .= round($size[0], 4);
+		$hash .= round($size[0], 3);
 
 		$hash = sha1($hash);
 
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 55d98f1ca..c4a46c11a 100644
--- 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();
 				$rulers[$p['document_id']] = array();
 			}
-			
+
 			if (!isset($links[$p['document_id']][$p['document_page']])) {
 				$links[$p['document_id']][$p['document_page']] = array();
 				$rulers[$p['document_id']][$p['document_page']] = array();
@@ -178,8 +178,6 @@ class wsDAODocument extends commonDAO {
 			}
 		}
 
-		fb($links);
-
 		foreach ($links as $document_id => $dummy) {
 			wsLinks::setDocumentLinks($document_id, json_encode($links[$document_id]), json_encode($rulers[$document_id]), $user, $comments, TIME);
 		}
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index fb4528a49..b48666afc 100644
--- 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);
 		$this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),
 			'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',
-				__('Grdf') => 'com.fluidbook.player.basket.custom.grdf.GrdfBasketManager',
-				__('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager',
-				__('Essilor Recap') => 'com.fluidbook.player.basket.cursor.essilorrecap.EssilorRecapBasketManager'), 'grade' => 5);
+				'Grdf' => 'com.fluidbook.player.basket.custom.grdf.GrdfBasketManager',
+				'Grdf 2013' => 'com.fluidbook.player.basket.custom.grdf.grdf2013.GrdfBasketManager2013',
+				'Essilor' => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager',
+				'Essilor Recap' => 'com.fluidbook.player.basket.cursor.essilorrecap.EssilorRecapBasketManager'), 'grade' => 5);
 		$this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
 			'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'), 'dir' => 'commerce');
 		$this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,
diff --git a/js/ws.js b/js/ws.js
index 93b895b85..006164ea5 100644
--- a/js/ws.js
+++ b/js/ws.js
@@ -17,8 +17,23 @@ function load_ws_once() {
 		});
 
 
-		$("#collection>form>ul a.delete").click(function() {
+		$(document).on('click', "#collection>form>ul a.delete", function() {
 			$(this).parents('li:first').remove();
+			return false;
+		});
+
+		$(document).on('click', "#collection>form>ul a.add", function() {
+			var publication = $(this).parents('li:first');
+			var group = $(publication).parents('.group');
+			var clone = $(".group.empty .publication").clone().get(0).outerHTML;
+
+			clone = clone.replace(/pnew_/gi, $(group).find('.publication').length);
+			clone = clone.replace(/new_/gi, $(group).data('group'));
+
+			$(publication).after(clone);
+
+			initAutocompleteCollection();
+			return false;
 		});
 
 		$("#collection>form>ul>li").each(function() {
@@ -31,6 +46,7 @@ function load_ws_once() {
 		$("#newGroup").click(function() {
 			var g = $(".group.empty").clone();
 			var html = g.get(0).outerHTML;
+			html = html.replace(/pnew_/gi, '0');
 			html = html.replace(/new_/gi, "new_" + newCounter);
 			g = $(html);
 			$(g).removeClass('empty');
@@ -52,17 +68,20 @@ function initGroup(group) {
 		connectWith: '#collection>form>ul ul'
 	});
 
+	initAutocompleteCollection();
+}
+
+function initAutocompleteCollection() {
 	try {
-		$('.publication_id').autocompletej(SITE_PATH + 'autocomplete/book', {
+		$('.publication_id:visible').not('.ac_input').autocompletej(SITE_PATH + 'autocomplete/book', {
 			cacheLength: 0,
 			maxItemsToShow: 15,
 			onFindValue: findBook,
 			onItemSelect: findBook
 		});
 	} catch (err) {
-		fb(err);
-	}
 
+	}
 }
 
 function load_ws() {
@@ -146,6 +165,9 @@ function findBook(li) {
 	if (book.length <= 1) {
 		return;
 	}
+
 	var book_id = parseInt(book[0]);
-	$(this.input).next('input[type="hidden"]:first').val(book_id);
+	var next = $(this.input).next('input[type="hidden"]:first');
+	fb(this.input);
+	$(next).val(book_id);
 }
\ No newline at end of file
diff --git a/style/ws/style.css b/style/ws/style.css
index 7f044f3fd..0bcf1ad5e 100644
--- 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;}
 
 .liste .bouton a{
-	height:26px;
+	height:16px;
 }
 
 #header{
@@ -517,7 +517,7 @@ th.stats_col{
 	margin:5px 0 10px 0;
 }
 
-.liste .bouton a.btbook{
+a.btbook{
 	display:inline-block;
 	height:16px;
 	padding:2px 6px 2px 2px;
@@ -547,40 +547,39 @@ th.stats_col{
 	box-shadow: 0px 0px 2px rgba(0,0,0,0.25);
 }
 
-.liste .bouton a.btbook>div{
+a.btbook>div{
 	display:inline-block;
 	width:16px;
 	height:16px;
 	background-position: 0 0;
 }
 
-.liste .bouton a.btbook>span{
+a.btbook>span{
 	display:inline-block;
 	vertical-align: top;
 	margin:0 0 0 5px;
 }
 
-.liste .bouton a.btbook:hover>div{
+a.btbook:hover>div{
 	background-position: 0 100%;
 }
 
-.liste .bouton a.btbook.suppr>div{
+a.btbook.suppr>div{
 	background-image: url("../../images/ws/btdel.png");
 }
 
-.liste .bouton a.btbook.voir>div{
+a.btbook.voir>div{
 	background-image: url("../../images/ws/btview.png");
 }
 
-.liste .bouton a.btbook.download>div{
+a.btbook.download>div{
 	background-image: url("../../images/ws/btdownload.png");
 }
 
-.liste .bouton a.btbook.stats>div{
+a.btbook.stats>div{
 	background-image: url("../../images/ws/btstats.png");
 }
-
-.liste .bouton a.btbook.edit>div{
+a.btbook.edit>div{
 	background-image: url("../../images/ws/btedit.png");
 }