issue #0001797 : Merge 1.3

application/controllers/ComptageController.php

@@ -234,19 +234,7 @@ class ComptageController extends Zend_Controller_Action
 		//Comptage
 		require_once 'Scores/Ciblage.php';
 		$ciblage = new Ciblage($fields->getValues(), $user->globalRNCS);
-		$sirets = $ciblage->execute(true, 10);
-
-		$c = Zend_Registry::get('config');
-		try {
-			$dbMetier = Zend_Db::factory($c->profil->db->jo);
-		} catch ( Exception $e ) {
-			if ( $user->idClient ) {
-			    exit ( $e->getMessage() );
-			} else {
-    		    echo "Prévisualisation indisponible";
-    		    exit;
-			}
-		}
+		$sirets = $ciblage->execute(true, 10);
 
 		/**
 		 * Make SQL request with the client profil for columns
@@ -259,7 +247,7 @@ class ComptageController extends Zend_Controller_Action
 		$result = $profilsM->fetchRow($sql);
 
 		$profil = json_decode($result['criteres'], true);
-
+		
 		//No profil, define it
 		if (count($profil)==0) {
 			$profil = array('raisonSociale');
@@ -268,10 +256,10 @@ class ComptageController extends Zend_Controller_Action
 		$extractSql = $extractLabel = array();
 		//$extractSql[] = "CONCAT(LPAD(siren, 9, '000000000'), LPAD(nic, 5, '00000')) AS siret";
 		//$extractLabel[] = 'SIRET';
-
 		require_once 'Scores/Enrichissement.php';
 		$enrichissement = new Enrichissement();
 		$data  = $enrichissement->getFields();
+		
 		foreach ( $data as $key => $item ) {
 			if (in_array($key, $profil)) {
 				if ( array_key_exists('sql', $item) ) {
@@ -281,10 +269,29 @@ class ComptageController extends Zend_Controller_Action
 				}
 				$extractLabel[] = $item['label'];
 			}
+			/*if ( array_key_exists('join', $item) ) {
+				
+				//Automatic column name .Lib
+				$joinColumn = $data[$item]['join']['column'];
+				$colName = $data[$item]['column'].$joinColumn;
+				$tabEntete[] = $colName;
+				//label
+				$extractLabel[] = $data[$item]['join']['label'];
+				//Sql
+				$tableAlias = array($data[$item]['column'].'_'.$joinColumn=>$data[$item]['join']['table']);
+				$extractSql[] = $data[$item]['column'].'_'.$joinColumn.'.'.$joinColumn.' AS '.$colName.',';
+				$join[]= array($tableAlias,$data[$item]['join']['stat']);
+			}*/
+		}
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$sql = $db->select()
+		->from(array('jo_act' => 'jo.etablissements_act'), $extractSql);
+		if($join){
+			foreach ($join as $params ){
+				$sql->joinLeft($params[0], $params[1],  array());
+		
+			}
 		}
-
-		$sql = $dbMetier->select()->from('etablissements_act', $extractSql);
-
 		$i = 0;
 		$where = '';
 		foreach($sirets as $siret) {
@@ -294,9 +301,11 @@ class ComptageController extends Zend_Controller_Action
 			$where.= "(siren='".substr($siret,0,9)."' AND nic='".substr($siret,9,5)."')";
 			$i++;
 		}
+		
 		$sql->where($where);
 
-		$result = $dbMetier->fetchAll($sql);
+		$result = $db->fetchAll($sql);
+		
 		$liste = array();
 		foreach ($result as $l => $line) {
 			$tmp = array();

application/controllers/DashboardController.php

@@ -3,8 +3,12 @@ class DashboardController extends Zend_Controller_Action
 {
     public function init()
     {
-       $this->view->headLink()->appendStylesheet('/themes/default/styles/dashboard.css', 'all');
-       $this->view->headScript()->appendFile('/themes/default/scripts/dashboard.js', 'text/javascript');
+       $this->view->headLink()
+           ->appendStylesheet('/themes/default/styles/dashboard.css', 'all')
+           ->appendStylesheet('/libs/jqpagination/jqpagination.css', 'all');
+       $this->view->headScript()
+           ->appendFile('/libs/jqpagination/jquery.jqpagination.min.js', 'text/javascript')
+           ->appendFile('/themes/default/scripts/dashboard.js', 'text/javascript');
     }
 
     public function indexAction()
@@ -67,7 +71,7 @@ class DashboardController extends Zend_Controller_Action
 			->order('i.dateAdded DESC');
 
 		$this->view->enrichissements = $enrichissements->fetchAll($sql);
-
+	
     }
 
     public function ciblagesAction()
@@ -95,11 +99,11 @@ class DashboardController extends Zend_Controller_Action
         //Récupérer les informations
         $position = ($page-1)*$offset+1;
         $sql = $criteresM->select()
-        ->from($criteresM, array('id', 'reference', 'dateAjout'))
-        ->where("idClient = ?", $user->idClient)
-        ->where("login = ?", $user->username)
-        ->order('dateAjout DESC')
-        ->limitPage($position, $offset);
+            ->from($criteresM, array('id', 'reference', 'dateAjout'))
+            ->where("idClient = ?", $user->idClient)
+            ->where("login = ?", $user->username)
+            ->order('dateAjout DESC')
+            ->limitPage($position, $offset);
 
         $rows = $criteresM->fetchAll($sql);
         $results = array();
@@ -129,6 +133,8 @@ class DashboardController extends Zend_Controller_Action
         $this->view->ciblages = $results;
         $this->view->nbCiblage = $nbCiblage;
 
+        $this->view->page = $page;
+        $this->view->nbPages = ceil($nbCiblage/$offset);
     }
 
     public function ciblageAction()
@@ -253,8 +259,6 @@ class DashboardController extends Zend_Controller_Action
         $encours = $enrichissementsM->fetchAll($sql);
         $this->view->encours = $encours;
 
-    	// Impossible de copie la varible issu d'un select car sinon elle conserve les meme propriété que sont parent
-    	// donc les selects... donc obliger de faire deux requetes pour le moment.
     	$sql = $enrichissementsM->select()
         	->setIntegrityCheck(false)
         	->from(

application/controllers/EnrichissementController.php

@@ -138,7 +138,12 @@ class EnrichissementController extends Zend_Controller_Action
 	 */
 	public function referenceAction()
 	{
-		$this->_helper->layout()->disableLayout();
+		//Constantes
+	    $resultatMax = 50000;
+		$redevanceInsee = 3.295/100;
+		$redevanceInseeMax = 52734; //Seuil de facturation 52 734 euros
+
+	    $this->_helper->layout()->disableLayout();
 		$request = $this->getRequest();
 
 		$selectprofil = $request->getParam('profil', 'default');
@@ -203,24 +208,24 @@ class EnrichissementController extends Zend_Controller_Action
 				$this->view->assign('uniteInsee', $item['uniteInsee']);
 
 				//Calcul du prix
-				//@todo : Put it somewhere we can modify it
-				$redevanceInsee = 3.295/100; //Seuil de facturation 52 734 euros
-
 				//@todo : Si le client a déjà payé la redevance INSEE
 				$prixInsee = $item['uniteInsee']*$redevanceInsee;
 				$infoInsee = '';
 				if ($profil->dataInsee){
-					$prixInsee = $item['resultat']*$redevanceInsee;
-					$infoInsee = "Votre profil inclus au moins une donnée Insee, la redevance sera applicable sur chaque ligne.";
+				    $prixInsee = $item['resultat']*$redevanceInsee;
+				    $infoInsee = "Votre profil inclus au moins une donnée Insee, la redevance sera applicable sur chaque ligne.";
 				}
-				$this->view->prixInsee = round($prixInsee, 2);
+				$this->view->prixInsee = round($prixInsee, 2);
 				$this->view->infoInsee = $infoInsee;
 
 				$prix = round($item['resultat'] * $priceLine + $prixInsee, 2);
 
+
+				if ( $item['resultat'] > $resultatMax ) {
+				    $this->view->assign('resultatOver', true);
+				}
 				//Forfait - Liste des commandes et calcul
-				if ($user->forfait>0)
-				{
+				elseif ( $user->forfait > 0 ) {
 					$dateBegin = $user->dateContrat;
 					$dateEnd = date('YmdHis', mktime(0,0,0,substr($user->dateContrat,5,2)+$user->periodContrat, substr($user->dateContrat,8,2), substr($user->dateContrat,0,4)));
 
@@ -240,13 +245,32 @@ class EnrichissementController extends Zend_Controller_Action
 
 					$this->view->forfaitRemain = $user->forfait - $conso - $prix;
 				}
-				//Limite lignes totales
-				elseif ($user->forfait==0 && $user->limitFiles>0) {
-				    //@todo : create the rule
+				//Fichier illimité (avec nombre de lignes définies)
+				elseif ( $user->forfait == 0 && $user->limitFiles == 0 ) {
+				    //Nombres de lignes dépassées
+				    if ( $item['resultat'] > $user->limitLines ) {
+				        $this->view->assign('resultatOver', 'lines');
+				    }
 				}
-				//Illimité
-				elseif ($user->forfait==0 && $user->limitFiles==0) {
+				//Fichier limité (avec nombre de lignes définies)
+				elseif ($user->forfait==0 && $user->limitFiles>0) {
+				    //Nombres de lignes dépassées
+				    if ( $user->limitLines != 0 && $item['resultat'] > $user->limitLines ) {
+				        $this->view->assign('resultatOver', 'lines');
+				    } else {
+				        //Nombre de fichier dépassés
+				        $dateBegin = $user->dateContrat;
+				        $dateEnd = date('YmdHis', mktime(0,0,0,substr($user->dateContrat,5,2)+$user->periodContrat, substr($user->dateContrat,8,2), substr($user->dateContrat,0,4)));
 
+				        $commandesM = new Application_Model_CiblageEnrichissementIdentifiants();
+				        $sql = $commandesM->select()
+				            ->where("dateAdded BETWEEN '".$dateBegin."' AND '".$dateEnd."'")
+				            ->where('idClient = ?', $user->idClient);
+				        $result = $commandesM->fetchAll($sql);
+				        if ( $result->count()+1 > $user->limitFiles) {
+				            $this->view->assign('resultatOver', 'files');
+				        }
+				    }
 				}
 
 				$this->view->prix = $prix;

application/controllers/UserController.php

@@ -8,12 +8,12 @@ class UserController extends Zend_Controller_Action
     public function loginAction()
     {
     	$this->view->inlineScript()
-    		->appendFile('/libs/jquery/jquery.js')
+    		->appendFile('/libs/jquery/jquery-1.10.1.min.js')
     		->appendFile('/libs/jquery/jquery.infieldlabel.min.js');
 
     	//@todo : gestion des affichages particuliers pour les clients
     	$this->view->headTitle()->append('Connexion');
-    	$form = new Form_Login();
+    	$form = new Application_Form_Login();
     	$this->view->form = $form;
     	$request = $this->getRequest();
     	if ($request->isPost()) {
@@ -67,6 +67,23 @@ class UserController extends Zend_Controller_Action
     	    $this->view->headMeta()->appendHttpEquiv('refresh', $refresh.'; url='.$url);
     	}
     }
+    /**
+     * Changer la langue de l'utilisateur
+     */
+    public function langAction()
+    {
+    	$this->_helper->layout()->disableLayout();
+    	$this->_helper->viewRenderer->setNoRender(true);
+    
+    	$lang = $this->getRequest()->getParam('lang', null);
+    
+    	$auth = Zend_Auth::getInstance();
+    	$identity = $auth->getIdentity();
+    
+    	$identity->langtmp = $lang;
+    
+    	$auth->getStorage()->write($identity);
+    }
 
 }
 

application/languages/totranslate.php

@@ -0,0 +1,27 @@
+<?php
+//Home
+$this->translate('Accueil');
+$this->translate('Préambule');
+$this->translate('Ajouter un profil');
+$this->translate('Désactiver');
+$this->translate('Ajouter un login avec le profil du client');
+$this->translate('Type d\'établissement');
+$this->translate('Sièges');
+$this->translate('Oui');
+$this->translate('Non');
+$this->translate('au');
+$this->translate('Appartient à un groupe');
+$this->translate('Téléphone renseigné');
+$this->translate('Télécopie renseignée');
+$this->translate('Site Web renseigné');
+$this->translate('Email de contact renseigné');
+$this->translate('Etablissement présent au RNCS');
+$this->translate('Adresse de domiciliation');
+$this->translate('Nom du principal dirigeant présent');
+$this->translate('Date de création de l\'établissement');
+$this->translate('Présence de participations');
+$this->translate('Valider');
+$this->translate('Réinitialiser les critères entreprises');
+$this->translate('à');
+$this->translate('Scores & Décisions SAS');
+?>

application/views/default/helpers/Field.php

@@ -18,7 +18,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 
 		$title = '';
 		if ( array_key_exists('title', $params) && !empty($params['title']) ) {
-			$title = $params['title'];
+			$title = $this->view->translate($params['title']);
 		}
 
 		//How many type of fields is defined
@@ -124,7 +124,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			}
 
 			$out.= '<div id="field_'.$type.'_'.$this->name.'" '.$class.''.$style.''.$title.'>';
-			$out.= $this->structureLabel($label);
+			$out.= $this->structureLabel($this->view->translate($label));
 			$out.= '<div class="field">'.$html.'</div>';
 			$out.= '</div>';
 
@@ -169,7 +169,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 					$return .= '<option '.(($sessionValeur[0] == $elements[0])?'selected':'').' value="'. $elements[0].'">'.number_format($elements[0], 0,'', ' ').'</option>';
 			}
 
-		$return .= '</select> à ';
+		$return .= '</select> '.$this->view->translate('à').' ';
 		$return .= '<select class="intervalSelect" name="'.$name.'2" id="'.$name.'" number="2">';
 			foreach($options['value'] as $elements) {
 				if($elements[1] == 0)
@@ -179,7 +179,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			}
 
 		$return .= '</select>';
-		$return .= ' <span id="'.$name.'"><a href="" class="intervalSelect" id="'.$name.'">Valider</a></span>';
+		$return .= ' <span id="'.$name.'"><a href="" class="intervalSelect" id="'.$name.'">'.$this->view->translate('Valider').'</a></span>';
 		return ($return);
 	}
 
@@ -248,7 +248,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			$selected = "";
 			if( $sessionValeur!==null && $sessionValeur != "-" && $sessionValeur==$value )
 				$selected = " selected";
-			$return .= '<option'.$selected.' value="'.$value.'">'.$label.'</option>';
+			$return .= '<option'.$selected.' value="'.$value.'">'.$this->view->translate($label).'</option>';
 		}
 		$return .= '</select>';
 
@@ -278,7 +278,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 		}
 		$return.= '</select>';
 
-		$return.= ' au ';
+		$return.= ' '.$this->view->translate('au').' ';
 
 		$return.= '<select name="'.$name.'2_j" style="width:45px;">';
 		for ($i=1;$i<=31;$i++) {
@@ -308,7 +308,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 			$return.= '<option'.$select.'>'.$i.'</option>';
 		}
 		$return.= '</select>';
-		$return .= '<br/><a href="#" id="'.$name.'" class="intervalDate">Valider</a>';
+		$return .= '<br/><a href="#" id="'.$name.'" class="intervalDate">'.$this->view->translate('Valider').'</a>';
 
 		return $return;
 	}
@@ -321,9 +321,9 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
 		$valeur = $session->getCritere($name);
 
 		$return = '<div class="interval" >';
-			$return .= '<input class="'.$field['class'].'" type="text" name="'.$name.'1" value="'.$valeur[0].'" /> à ';
+			$return .= '<input class="'.$field['class'].'" type="text" name="'.$name.'1" value="'.$valeur[0].'" /> '.$this->view->translate('à').' ';
 			$return .= '<input class="'.$field['class'].'" type="text" name="'.$name.'2" value="'.$valeur[1].'" />';
-			$return .= ' <a href="" class="interval" id="'.$name.'">Valider</a>';
+			$return .= ' <a href="" class="interval" id="'.$name.'">'.$this->view->translate('Valider').'</a>';
 		$return .= '</div>';
 
 		return $return;

application/views/default/scripts/aide/index.phtml

@@ -1,5 +1,4 @@
 <div id="help">
-
 <h2>Préambule</h2>
 <p>
 L'application se décompose en deux parties : <br/>

application/views/default/scripts/dashboard/ciblages.phtml

@@ -10,12 +10,12 @@
 </li>
 </ul>
 
-<div id="dashboard">
+<div id="dashboard" class="clearfix">
 
 <div style="margin:5px 0;">
 <h2>Liste de vos ciblages</h2>
 
-<?php if(count($this->ciblages)>0):?>
+<?php if(count($this->ciblages)>0) {?>
 
 <table class="ciblage">
 <thead>
@@ -28,7 +28,7 @@
 </tr>
 </thead>
 <tbody>
-<?php foreach($this->ciblages as $item):?>
+<?php foreach($this->ciblages as $item) {?>
 <tr>
 	<td class="reference"><?=$item['reference']?></td>
 	<td class="update resultat"><?=number_format($item['resultat'], 0, ',', ' ')?></td>
@@ -37,13 +37,33 @@
 	<td><a href="<?=$this->url(array('controller'=> 'dashboard','action'=>'ciblage', 'id'=>$item['id']))?>">Detail</a></td>
 	<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Charger les critères de ciblage dans l'interface</a></td>
 </tr>
-<?php endforeach;?>
+<?php }?>
 </tbody>
 </table>
 
-<?php else:?>
+<div style="margin:5px auto;width:333px;">
+<div class="pagination">
+    <a href="#" class="first" data-action="first">&laquo;</a>
+    <a href="#" class="previous" data-action="previous">&lsaquo;</a>
+    <input type="text" readonly="readonly" data-current-page="<?=$this->page?>" data-max-page="<?=$this->nbPages?>" />
+    <a href="#" class="next" data-action="next">&rsaquo;</a>
+    <a href="#" class="last" data-action="last">&raquo;</a>
+</div>
+
+<script>
+$('.pagination').jqPagination({
+	page_string: "Page {current_page} sur {max_page}",
+    paged: function(page) {
+        window.location.href = window.location.href + '/page/'+page;
+    }
+});
+</script>
+
+</div>
+
+<?php } else {?>
 	<p>Aucun ciblage.<p>
-<?php endif;?>
+<?php }?>
 
 </div>
 

application/views/default/scripts/dashboard/index.phtml

@@ -2,7 +2,7 @@
 <li class="e0"><a class="lir" href="/">Accueil</a></li>
 <li>
 	<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'))?>">
-		<span>Tableau de bord</span>
+		<span><?=$this->translate('Tableau de bord')?></span>
 	</a>
 </li>
 <li class="last">
@@ -13,27 +13,27 @@
 <div id="dashboard">
 
 <div id="menu">
-<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'ciblages'))?>">Liste de vos ciblages</a> -
-<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'enrichissements'))?>">Liste de vos enrichissements</a> -
-<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'configuration'))?>">Préférences de l'application</a> -
-<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>''))?>">Enrichissement de fichier</a>
+<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'ciblages'))?>"><?=$this->translate('Liste de vos ciblages')?></a> -
+<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'enrichissements'))?>"><?=$this->translate('Liste de vos enrichissements')?></a> -
+<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'configuration'))?>"><?=$this->translate('Préférences de l\'application')?></a> -
+<a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>''))?>"><?=$this->translate('Enrichissement de fichier')?></a>
 </div>
 
 <div id="rechercheCiblage">
-<h2>Rechercher dans vos ciblages</h2>
+<h2><?=$this->translate('Rechercher dans vos ciblages')?></h2>
 <input type="text" name="searchCiblage" class="searchCiblage" />
-<input type="submit" value="Rechercher" class="submit"/>
+<input type="submit" value="<?=$this->translate('Rechercher')?>" class="submit"/>
 </div>
 
 <div id="lastCiblage">
-	<h2>Vos derniers ciblages</h2>
+	<h2><?=$this->translate('Vos derniers ciblages')?></h2>
 	<?php if(count($this->comptages) > 0):?>
 	<table>
 		<thead>
 			<tr>
-				<th>Référence</th>
-				<th>Nombre d'entité</th>
-				<th>Unité Insee</th>
+				<th><?=$this->translate('Référence')?></th>
+				<th><?=$this->translate('Nombre d\'entité')?></th>
+				<th><?=$this->translate('Unité Insee')?></th>
 				<th>Date</th>
 				<th colspan="4"></th>
 			</tr>
@@ -46,19 +46,19 @@
 				<td class="update insee"><?=number_format($item['uniteInsee'], 0, ',', ' ')?></td>
 				<td class="update date"><?=$item['dateComptage']?></td>
 				<td><a href="<?=$this->url(array('controller'=> 'dashboard','action'=>'ciblage', 'id'=>$item['id']))?>">Detail</a></td>
-				<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>">Charger les critères de ciblage dans l'interface</a></td>
+				<td><a href="<?=$this->url(array('controller'=> 'index','action'=>'index', 'id'=>$item['id']))?>"><?=$this->translate('Charger les critères de ciblage dans l\'interface')?></a></td>
 			</tr>
 			<?php endforeach;?>
 		</tbody>
 	</table>
 	<?php else:?>
-		<p>Aucun ciblage.<p>
+		<p><?=$this->translate('Aucun ciblage')?>.<p>
 	<?php endif;?>
 </div>
 
 
 <div id="lastEnrichissement">
-	<h2>Vos derniers enrichissements</h2>
+	<h2><?=$this->translate('Vos derniers enrichissements')?></h2>
 	<?php if(count($this->enrichissements) > 0):?>
 	<table>
 		<thead>
@@ -70,8 +70,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<?php $i=0;foreach($this->enrichissements as $item):?>
-			<?php if($i++ == 5)break;?>
+			<?php foreach($this->enrichissements as $item):?>
 			<tr>
 				<td><?=$item['reference']?></td>
 				<td><?=number_format($item['nbLigneTotales'], 0, ',', ' ')?></td>
@@ -90,7 +89,7 @@
 		</tbody>
 	</table>
 	<?php else:?>
-		<p>Aucun enrichissement.<p>
+		<p><?=$this->translate('Aucun enrichissement')?>.<p>
 	<?php endif;?>
 </div>
 

application/views/default/scripts/enrichissement/reference.phtml

@@ -1,16 +1,35 @@
 <?php if ( !$this->profil ) {?>
+
 Aucun profil d'enrichissement, Merci de prendre contact avec le service commercial.
+
 <?php } elseif ( empty($this->id) ) {?>
+
 Erreur
-<?php } elseif ($this->resultat>50000) {?>
+
+<?php } elseif ( $this->resultat === true) {?>
+
 <p>Le nombre de lignes à enrichir est trop important.
-Vous pouvez prendre contact avec le service commercial en cliquant ici.
-Vos critères seront enregistrées et une référence vous sera fourni.</p>
-<?php } elseif ($this->forfaitRemain && $this->forfaitRemain<=0) { ?>
+Vous pouvez prendre contact avec le service commercial.</p>
+
+<?php } elseif ( $this->resultat == 'lines') {?>
+
+<p>Le nombre de lignes à enrichir est supérieur au nombre de ligne maximum définies dans la contrat.
+Vous pouvez prendre contact avec le service commercial.</p>
+
+<?php } elseif ( $this->resultat == 'files') {?>
+
+<p>Le nombre maximum de fichier enrichit a été atteint.
+Vous pouvez prendre contact avec le service commercial.</p>
+
+
+<?php } elseif ( $this->forfaitRemain && $this->forfaitRemain<=0 ) { ?>
+
 <p>Le montant de votre forfait est insuffisant
-Vous pouvez prendre contact avec le service commercial en cliquant ici.
-Vos critères seront enregistrées et une référence vous sera fourni.</p>
+Vous pouvez prendre contact avec le service commercial.
+</p>
+
 <?php } else {?>
+
 <div id="update">
 <style>
 #enrichissement { width:100%; }

application/views/default/scripts/footer.phtml

@@ -1,3 +1,9 @@
+<<<<<<< .working
 <div class="container">
 <p class="text-muted credit"> &copy; <?=date('Y')?> <a href="http://www.scores-decisions.com">Scores & Décisions</a>.</p>
-</div>
+</div>=======
+<p class="info">
+<a href="http://www.scores-decisions.com/">Scores & Décisions SAS</a>
+<img class='flag' id='fr' src="/themes/default/images/drapeaux/fr.png"/>
+<img class='flag' id='en' src="/themes/default/images/drapeaux/en.png"/>
+</p>>>>>>>> .merge-right.r987

application/views/default/scripts/index/index.phtml

@@ -1,7 +1,7 @@
 <?php if ($this->CiblageError) { ?>
 
 <div class="alert alert-danger">
-Erreur ! Le moteur de ciblage n'est pas disponible !
+<?=$this->translate('Erreur ! Le moteur de ciblage n\'est pas disponible !')?>
 </div>
 
 <?php } else {?>

application/views/default/scripts/menu.phtml

@@ -3,14 +3,14 @@
     	<?php if ($this->msgComptage){?>
     		<div id="comptage" >
     		<?php if ( $this->total!==null ) {?>
-    			Sélection :
+    			<?=$this->translate('Sélection')?> :
     			<span class="valeur"><?=number_format($this->total, 0, '', ' ')?></span>
     			<?php if ( $this->insee!==null ) {?>
     			(dont <span class="valeur"><?=number_format($this->insee, 0, '', ' ')?></span> unité(s) insee)
     			<?php }?>
-    		<?php } else {?>
-    			Aucune sélection.
-    		<?php }?>
+    		<?php } else {
+    			echo $this->translate('Aucune sélection');
+    		}?>
     		</div>
     		<div id="attente" style="display:none;">
     			<img src="/themes/default/images/ajax.gif" />
@@ -22,13 +22,13 @@
     	<?php }?>
     </div>
 	<ul>
-		<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='accueil') echo ' class="active"';?>>Accueil</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='dashboard') echo ' class="active"';?>>Tableau de bord</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='aide') echo ' active';?>>Aide</a></li>
-		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'aproposde'), null, true)?>"<?php if ($this->menuActive=='aproposde') echo ' class="active"';?>>A propos de</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='accueil') echo ' class="active"';?>><?=$this->translate('Accueil')?></a></li>
+		<li><a href="<?=$this->url(array('controller'=>'dashboard', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='dashboard') echo ' class="active"';?>><?=$this->translate('Tableau de bord')?></a></li>
+		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='aide') echo ' active';?>><?=$this->translate('Aide')?></a></li>
+		<li><a href="<?=$this->url(array('controller'=>'aide', 'action'=>'aproposde'), null, true)?>"<?php if ($this->menuActive=='aproposde') echo ' class="active"';?>><?=$this->translate('A propos de')?></a></li>
 		<?php if ( $this->admin ) {?>
-		<li><a href="<?=$this->url(array('controller'=>'gestion', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='gestion') echo ' class="active"';?>>Gestion</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'gestion', 'action'=>'index'), null, true)?>"<?php if ($this->menuActive=='gestion') echo ' class="active"';?>><?=$this->translate('Gestion')?></a></li>
 		<?php }?>
-		<li><a href="<?=$this->url(array('controller'=>'user', 'action'=>'logout'), null, true)?>">Déconnexion</a></li>
+		<li><a href="<?=$this->url(array('controller'=>'user', 'action'=>'logout'), null, true)?>"><?=$this->translate('Déconnexion')?></a></li>
 	</ul>
 </div>

application/views/default/scripts/user/lang.phtml

@@ -0,0 +1 @@
+<div class="infoData"></div>

docs/README

@@ -0,0 +1,117 @@
+README
+======
+
+ - System Requirements
+ - Installation
+ - Project
+ - Library
+
+Note : Project are define to be use on Linux Server, so take care about path and file name. 
+ Also some script (CLI) don't work on Windows.
+
+
+SYSTEM REQUIREMENTS
+===================
+
+ - Apache 2.2
+ - PHP 5.3.x
+ - APC
+
+
+INSTALLATION
+============
+
+See the file scripts/build/configure.php
+
+On server this script is automatically called with the install option.
+	configure.php --install
+
+Each servers are reference with a directory, name as the hostname, in config dir and all configure 
+file is list here
+
+
+Environment configuration
+-------------------------
+
+ - Variables
+ 	
+ Define application environment in the vhost. This mode activate special features and debugging mode.
+
+	SetEnv APPLICATION_ENV "production" => Production
+	SetEnv APPLICATION_ENV "staging" => Recette
+	SetEnv APPLICATION_ENV "development" => Developpement
+ 
+
+Apache configuration
+--------------------
+
+	=> Development example
+
+	<VirtualHost *:80>
+		ServerName sdciblage.sd.dev
+		AddDefaultCharset utf-8
+		DirectoryIndex index.php
+		SetEnv APPLICATION_ENV "development"	
+		DocumentRoot "WORKSPACE/sdciblage/public"
+		<Directory "WORKSPACE/sdciblage/public/">
+			AllowOverride none
+			Order allow,deny
+			Allow from all  
+			<IfModule mod_rewrite.c>
+	            RewriteEngine On
+	            RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR]
+	            RewriteCond %{REQUEST_FILENAME} -s [OR]
+	            RewriteCond %{REQUEST_FILENAME} -l [OR]
+	            RewriteCond %{REQUEST_FILENAME} -d
+	            RewriteRule ^.*$ - [NC,L]
+				RewriteRule ^.*$ index.php [NC,L]
+			</IfModule>
+		</Directory>
+		# Possible values include: debug, info, notice, warn, error, crit, alert, emerg.
+		LogLevel notice
+		ErrorLog "logs/sdciblage-error.log"
+		CustomLog "logs/sdciblage-access.log" common
+	</VirtualHost>
+
+
+PHP Configuration
+-----------------
+
+Session
+-------
+	On sharing plateform, these parameters must be specified to the best value for all web application
+
+    session.gc_maxlifetime = 86400
+    session.cookie_lifetime = 86400
+
+	Application must override the session.save_path, soap.wsdl_cache_dir to define it's own path.
+
+
+Project
+=======
+
+	The purpose of this application is to select a list of company and extract information.
+	On the interface, filter is apply for the selection. And the deliver file, a csv file, give all 
+	the detail of companies.
+
+	Structure
+	---------
+	- Zend Framework version 1.x	
+	
+		
+	Assets
+	------
+	- JQuery
+	- JQuery-UI	
+	
+	Development
+	-----------
+
+
+Library
+=======
+
+	Scores_Ciblage
+	Scores_Enrichissement
+	Scores_Fields
+

docs/README.txt

@@ -1,30 +0,0 @@
-README
-======
-
-This directory should be used to place project specfic documentation including
-but not limited to project notes, generated API/phpdoc documentation, or
-manual files generated or hand written.  Ideally, this directory would remain
-in your development environment only and should not be deployed with your
-application to it's final production location.
-
-
-Setting Up Your VHOST
-=====================
-
-The following is a sample VHOST you might want to consider for your project.
-
-<VirtualHost *:80>
-   DocumentRoot "C:/workspace/sdciblage2/public"
-   ServerName .local
-
-   # This should be omitted in the production environment
-   SetEnv APPLICATION_ENV development
-
-   <Directory "C:/workspace/sdciblage2/public">
-       Options Indexes MultiViews FollowSymLinks
-       AllowOverride All
-       Order allow,deny
-       Allow from all
-   </Directory>
-
-</VirtualHost>

library/Application/Controller/Plugin/Auth.php

@@ -58,14 +58,13 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 			    $layout = Zend_Layout::getMVCInstance();
 
 			    //Authentifié => on met à jour la session
-			    if ( $auth->hasIdentity() )
-			    {
+			    if ( $auth->hasIdentity() && time() < $auth->getIdentity()->time ) {
 
 			        $identity = $auth->getIdentity();
 			        $identity->time = time() + $identity->timeout;
 
-			        if ( !isset($identity->dateContrat) && $layout->isEnabled() )
-			        {
+			        if ( !isset($identity->dateContrat) && $layout->isEnabled() ) {
+
 			            //Get customer's params
 			            $paramsM = new Application_Model_CiblageCustomerParams();
 			            $sql = $paramsM->select()
@@ -146,7 +145,7 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 			            Zend_Session::namespaceUnset('login');
 			        }
 
-			    } elseif (time() > $auth->getIdentity()->time ) {
+			    } elseif ($auth->hasIdentity() && time() > $auth->getIdentity()->time ) {
 
 			        if ( $request->getControllerName()=='index' && $request->getActionName()=='index' ) {
 			            $request->setModuleName('default')
@@ -161,17 +160,17 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
 
 			    } else {
 
-			        if ( !$request->isXmlHttpRequest() ) {
+			        if ($request->isXmlHttpRequest()) {
+			            $request->setModuleName('default')
+			            ->setControllerName('user')
+			            ->setActionName('logout')
+			            ->setParam('ajax', 1);
+			        } else {
 			            $session = new Zend_Session_Namespace('login');
 			            $session->url = $_SERVER['REQUEST_URI'];
 			            $request->setModuleName('default')
-			                ->setControllerName('user')
-			                ->setActionName('login');
-			        } else {
-			            $request->setModuleName('default')
-			                ->setControllerName('user')
-			                ->setActionName('logout')
-			                ->setParam('ajax', 1);
+			            ->setControllerName('user')
+			            ->setActionName('login');
 			        }
 
 			    }

library/Application/Controller/Plugin/Lang.php

@@ -0,0 +1,56 @@
+<?php
+class Application_Controller_Plugin_Lang extends Zend_Controller_Plugin_Abstract
+{
+    /**
+     * Vérifie les autorisations
+     * Utilise _request et _response hérités et injectés par le FC
+     *
+     * @param Zend_Controller_Request_Abstract $request : non utilisé, mais demandé par l'héritage
+     */
+	public function preDispatch(Zend_Controller_Request_Abstract $request)
+	{
+	    $auth = Zend_Auth::getInstance();
+	    if ( $auth->hasIdentity() ) {
+	        $identity = $auth->getIdentity();
+	        $lang = $identity->langtmp;
+	        switch($lang) {
+	            case 'en':
+	                $locale = new Zend_Locale('en');
+	                break;
+	            case 'fr':
+	            default:
+	                $locale = new Zend_Locale('fr');
+	                break;
+	        }
+	    } else {
+	        $locale = new Zend_Locale('fr');
+	    }
+
+	    $cache = Zend_Cache::factory(
+	            'Core',
+	            'Apc',
+	            array('lifetime' => 28800, 'automatic_serialization' => true),
+	            array()
+	    );
+	    Zend_Translate::setCache($cache);
+
+	    $translate = new Zend_Translate(
+            array(
+                'adapter' => 'gettext',
+                'content' => APPLICATION_PATH . DIRECTORY_SEPARATOR . 'languages' . DIRECTORY_SEPARATOR . 'fr.mo',
+                'locale'  => 'fr',
+            )
+	    );
+	    $translate->addTranslation(
+            array(
+                'content' => APPLICATION_PATH . DIRECTORY_SEPARATOR . 'languages' . DIRECTORY_SEPARATOR . 'en.mo',
+                'locale'  => 'en',
+            )
+	    );
+	    $translate->setLocale($locale);
+
+	    $registry = Zend_Registry::getInstance();
+	    $registry->set('Zend_Locale', $locale);
+	    $registry->set('Zend_Translate', $translate);
+	}
+}

library/Application/Form/Login.php

@@ -1,5 +1,5 @@
 <?php
-class Form_Login extends Zend_Form {
+class Application_Form_Login extends Zend_Form {
 
 	public function init()
 	{

library/Scores/AuthAdapter.php

@@ -46,7 +46,10 @@ class Scores_AuthAdapter implements Zend_Auth_Adapter_Interface
 		$identity->timeout = $timeout;
 
 		$identity->time = time() + $timeout;
-
+		
+		$lang = in_array($InfosLogin->result->lang, array('fr','en')) ? $InfosLogin->result->lang : 'fr';
+		$identity->lang = $lang;
+		$identity->langtmp = $lang;
 		/*
 		 * Adresse Ip interdites
 		 */

library/Scores/Ciblage.php

@@ -639,6 +639,26 @@ class Ciblage
 		}
 	}
 
+	protected function bilAnnee($value)
+	{
+		if ( array_key_exists('in', $value) ) {
+			$this->setFilter('bilAnnee', $value['in']);
+		}
+		if ( array_key_exists('ex', $value) ) {
+			$this->setFilter('bilAnnee', $value['ex'], true);
+		}
+	}
+
+	protected function bilCloture($value)
+	{
+		if ( array_key_exists('in', $value) ) {
+			$this->setFilter('bilCloture', $value['in']);
+		}
+		if ( array_key_exists('ex', $value) ) {
+			$this->setFilter('bilCloture', $value['ex'], true);
+		}
+	}
+
 	protected function bilDuree($value)
 	{
 	    if ( array_key_exists('in', $value) ) {
@@ -1084,6 +1104,17 @@ class Ciblage
 	    }
 	}
 
+	protected function codesdepts($value)
+	{
+	    if ( array_key_exists('in', $value) && is_array($value['in']) && count($value['in'])>0 ) {
+	        $this->setFilter('adr_dep', $value['in']);
+	    }
+
+	    if ( array_key_exists('ex', $value) && is_array($value['ex']) && count($value['ex'])>0 ) {
+	        $this->setFilter('adr_dep', $value['ex']);
+	    }
+	}
+
 	protected function codespostaux($value)
 	{
 	    if ( array_key_exists('in', $value) && is_array($value['in']) && count($value['in'])>0 ) {

library/Scores/Enrichissement.php

@@ -153,7 +153,7 @@ class Enrichissement
 	protected $fields = array(
 		'siege' => array(
 			'label' => "Type d'établissement",
-			'column' => 'siege'
+			'column' => 'siege',
 		),
 		'raisonSociale' => array(
 			'label' => "Raison Sociale",
@@ -212,8 +212,12 @@ class Enrichissement
 			'sql' => 'LPAD(fax, 10, 0000000000) AS fax'
 		),
 		'cj' => array(
-			'label' => "Forme juridique",
-			'column' => 'cj'
+			'label' => "Code Forme juridique",
+			'column' => 'cj',
+			'join' => array('label'=>'Forme juridique',
+							'column'=>'libelle',
+							'table'=>'jo.tabFJur',
+							'stat'=>'jo.etablissements_act.cj=cj_libelle.code')
 		),
 		'dirigeant' => array(
 			'label' => "Dirigeant",
@@ -221,21 +225,49 @@ class Enrichissement
 			'sql' => "CONCAT_WS(' ', dirCiv, dirNom, dirPrenom) AS dirigeant",
 		),
 		'dirigeantFct' => array(
-			'label' => "Dirigeant - Fonction",
+			'label' => "Dirigeant - Code Fonction",
 			'column' => 'dirFct',
+			'join' => array('label'=>'Dirigeant - Libelle Fonction',
+					'column'=>'libelle',
+					'table'=>'jo.bodacc_fonctions',
+					'stat'=>'jo.etablissements_act.dirFct=dirFct_libelle.codeFct')
 		),
+		/*'dirigeantFct' => array(
+			'label' => array("Dirigeant - Code Fonction","Dirigeant - Libelle Fonction"),
+			'column' => 'libelle',
+			'sql' => array('dirFct',"jo_fonctions.libelle"),
+		),*/
+		
 		'dirigeantnaiss' => array(
 			'label' => "Dirigeant - Date de naissance",
 			'column' => 'dirDateNaiss'
 		),
 		'nafetablissement' => array(
 			'label' => "Code NAF Etablissement",
-			'column' => 'ape_etab'
+			'column' => 'ape_etab',
+			'join' => array('Libelle NAF Etablissement',
+					'column'=>'libNaf5',
+					'table'=>'jo.tabNaf5',
+					'stat'=>'jo.etablissements_act.ape_etab=ape_etab_libNaf5.codNaf5')
 		),
+		/*'libNaf5_etab' => array(
+			'label' => "Libelle NAF Etablissement",
+			'column' => 'ape_etab',
+			'sql' => "jo_etab.libNaf5 AS etab_libNaf5",
+		),*/
 		'nafentreprise' => array(
 			'label' => "Code NAF Entreprise",
-			'column' => 'ape_entrep'
+			'column' => 'ape_entrep',
+			'join' => array('Libelle NAF Entreprise',
+					'column'=>'libNaf5',
+					'table'=>'jo.tabNaf5',
+					'stat'=>'jo.etablissements_act.ape_entrep=ape_entrep_libNaf5.codNaf5')
 		),
+		/*'libNaf5_entrep' => array(
+			'label' => "Libelle NAF Entreprise",
+			'column' => 'ape_entrep',
+			'sql' => "jo_entrep.libNaf5 AS entrep_libNaf5",
+		),*/
 		'effetablissement' => array(
 			'label' => "Effectif Etablissement",
 			'column' => 'eff_etab'
@@ -245,11 +277,11 @@ class Enrichissement
 			'column' => 'eff_entrep'
 		),
 		'teffetablissement' => array(
-			'label' => "Tranche Effectif Etablissement",
+			'label' => "Code Tranche Effectif Etablissement",
 			'column' => 'teff_etab'
 		),
 		'teffentreprise' => array(
-			'label' => "Tranche Effectif Entreprise",
+			'label' => "Code Tranche Effectif Entreprise",
 			'column' => 'teff_entrep'
 		),
 		'capital' => array(

library/Scores/Fields.php

@@ -621,7 +621,7 @@ Les zones urbaines sensibles constituent un sous-ensemble de l'ensemble plus lar
 		'bilAnnee' => array(
 			'label' => 'Dernière année de bilan',
 			'fields' => array(
-				'interval' => array('value' => array('0', '1000'))
+				'interval' => array('value' => array('0', '3000'))
 			),
 			'famille' => 'financier',
 			'activated' => true,
@@ -630,7 +630,7 @@ Les zones urbaines sensibles constituent un sous-ensemble de l'ensemble plus lar
 		'bilCloture' => array(
 			'label' => 'Dernière date de clôture du bilan',
 			'fields' => array(
-				'interval' => array('value' => array('0', '1000'))
+				'interval' => array('value' => array('0', '3000'))
 			),
 			'famille' => 'financier',
 			'activated' => true,

public/libs/jqpagination/jqpagination.css

@@ -0,0 +1,135 @@
+.pagination {
+	float: left;
+	border: 1px solid #CDCDCD;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.pagination a {
+	display: block;
+	float: left;
+	height: 20px;
+	width: 20px;
+	background-color: rgb(0,50,75);
+	color: #555555;
+	text-align: center;
+	text-decoration: none;
+	font-family: Times, 'Times New Roman', Georgia, Palatino; /* ATTN: need a better font stack */
+	font-weight: bold;
+	font-size: 16px;
+	outline: none;
+	vertical-align: middle;
+
+	background: #F3F3F3; /* Old browsers */
+	background: -moz-linear-gradient(top,  #F3F3F3 0%, #D3D3D3 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F3F3F3), color-stop(100%,#D3D3D3)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* IE10+ */
+	background: linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F3F3F3', endColorstr='#D3D3D3',GradientType=0 ); /* IE6-9 */
+
+}
+
+.pagination a:hover, .pagination a:focus, .pagination a:active {
+
+	background: #CECECE; /* Old browsers */
+	background: -moz-linear-gradient(top,  #E4E4E4 0%, #CECECE 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#E4E4E4), color-stop(100%,#CECECE)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top,  #E4E4E4 0%,#CECECE 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top,  #E4E4E4 0%,#CECECE 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top,  #E4E4E4 0%,#CECECE 100%); /* IE10+ */
+	background: linear-gradient(top,  #E4E4E4 0%,#CECECE 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E4E4E4', endColorstr='#CECECE',GradientType=0 ); /* IE6-9 */
+
+}
+
+.pagination a.disabled, .pagination a.disabled:hover, .pagination a.disabled:focus, .pagination a.disabled:active {
+
+	background: #F3F3F3; /* Old browsers */
+	background: -moz-linear-gradient(top,  #F3F3F3 0%, #D3D3D3 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F3F3F3), color-stop(100%,#D3D3D3)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* IE10+ */
+	background: linear-gradient(top,  #F3F3F3 0%,#D3D3D3 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F3F3F3', endColorstr='#D3D3D3',GradientType=0 ); /* IE6-9 */
+
+	color: #A8A8A8;
+	
+}
+
+.pagination a:first-child {
+	border-radius: 2px 0 0 2px;
+	-moz-border-radius: 2px 0 0 2px;
+	-webkit-border-radius: 2px 0 0 2px;
+}
+
+.pagination a:last-child {
+	border-radius: 0 2px 2px 0;
+	-moz-border-radius: 0 2px 2px 0;
+	-webkit-border-radius: 0 2px 2px 0;
+}
+
+.pagination a {
+	border-right: 1px solid #CDCDCD; 
+	border-left: 1px solid #CDCDCD;   
+}
+
+.pagination a:first-child {
+	border: none;
+}
+
+.pagination a:last-child {
+	border: none;
+}
+
+.pagination input {
+	border: none;
+	float: left;
+	text-align: center;
+	height: 20px;
+	outline: none;
+	vertical-align: middle;
+	width: 120px;
+	padding: 0;
+	margin: 0;
+}
+
+/* gigantic class for demo purposes */
+
+.gigantic.pagination {
+	margin: 30px 0;
+}
+
+.gigantic.pagination a {
+	height: 60px;
+	width: 60px;
+	font-size: 50px;
+	line-height: 50px;
+}
+
+.gigantic.pagination input {
+	width: 300px;
+	height: 60px;
+	font-size: 30px;
+}
+
+/* log element for demo purposes */
+
+.log {
+	display: none;
+	background-color: #EDEDED;
+	border: 1px solid #B4B4B4;
+	height: 300px;
+	width: 524px;
+	overflow: auto;
+	margin-left: 0;
+	list-style: none;
+	padding: 10px;
+	li {
+		margin-top: 0;
+		margin-bottom: 5px;
+	}
+}

public/libs/jqpagination/jquery.jqpagination.min.js

@@ -0,0 +1,21 @@
+/*!
+ * jqPagination, a jQuery pagination plugin (obviously)
+ *
+ * Copyright (C) 2011 Ben Everard
+ *
+ * http://beneverard.github.com/jqPagination
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *     
+ */(function(e){"use strict";e.jqPagination=function(t,n){var r=this;r.$el=e(t);r.el=t;r.$input=r.$el.find("input");r.$el.data("jqPagination",r);r.init=function(){r.options=e.extend({},e.jqPagination.defaultOptions,n);r.options.max_page===null&&(r.$input.data("max-page")!==undefined?r.options.max_page=r.$input.data("max-page"):r.options.max_page=1);r.$input.data("current-page")!==undefined&&r.isNumber(r.$input.data("current-page"))&&(r.options.current_page=r.$input.data("current-page"));r.$input.removeAttr("readonly");r.updateInput(!0);r.$input.on("focus.jqPagination mouseup.jqPagination",function(t){if(t.type==="focus"){var n=parseInt(r.options.current_page,10);e(this).val(n).select()}if(t.type==="mouseup")return!1});r.$input.on("blur.jqPagination keydown.jqPagination",function(t){var n=e(this),i=parseInt(r.options.current_page,10);if(t.keyCode===27){n.val(i);n.blur()}t.keyCode===13&&n.blur();t.type==="blur"&&r.setPage(n.val())});r.$el.on("click.jqPagination","a",function(t){var n=e(this);if(n.hasClass("disabled"))return!1;if(!t.metaKey&&!t.ctrlKey){t.preventDefault();r.setPage(n.data("action"))}})};r.setPage=function(e){if(e===undefined)return r.options.current_page;var t=parseInt(r.options.current_page,10),n=parseInt(r.options.max_page,10);if(isNaN(parseInt(e,10)))switch(e){case"first":e=1;break;case"prev":case"previous":e=t-1;break;case"next":e=t+1;break;case"last":e=n}e=parseInt(e,10);if(isNaN(e)||e<1||e>n||e===t){r.setInputValue(t);return!1}r.options.current_page=e;r.$input.data("current-page",e);r.updateInput()};r.setMaxPage=function(e){if(e===undefined)return r.options.max_page;if(!r.isNumber(e)){console.error("jqPagination: max_page is not a number");return!1}if(e<r.options.current_page){console.error("jqPagination: max_page lower than current_page");return!1}r.options.max_page=e;r.$input.data("max-page",e);r.updateInput()};r.updateInput=function(e){var t=parseInt(r.options.current_page,10);r.setInputValue(t);r.setLinks(t);e!==!0&&r.options.paged(t)};r.setInputValue=function(e){var t=r.options.page_string,n=r.options.max_page;t=t.replace("{current_page}",e).replace("{max_page}",n);r.$input.val(t)};r.isNumber=function(e){return!isNaN(parseFloat(e))&&isFinite(e)};r.setLinks=function(e){var t=r.options.link_string,n=parseInt(r.options.current_page,10),i=parseInt(r.options.max_page,10);if(t!==""){var s=n-1;s<1&&(s=1);var o=n+1;o>i&&(o=i);r.$el.find("a.first").attr("href",t.replace("{page_number}","1"));r.$el.find("a.prev, a.previous").attr("href",t.replace("{page_number}",s));r.$el.find("a.next").attr("href",t.replace("{page_number}",o));r.$el.find("a.last").attr("href",t.replace("{page_number}",i))}r.$el.find("a").removeClass("disabled");n===i&&r.$el.find(".next, .last").addClass("disabled");n===1&&r.$el.find(".previous, .first").addClass("disabled")};r.callMethod=function(e,t,n){switch(e.toLowerCase()){case"option":switch(t.toLowerCase()){case"current_page":return r.setPage(n);case"max_page":return r.setMaxPage(n)}console.error("jqPagination: cannot get / set option "+t);return!1;case"destroy":r.$el.off(".jqPagination").find("*").off(".jqPagination");break;default:console.error('jqPagination: method "'+e+'" does not exist');return!1}};r.init()};e.jqPagination.defaultOptions={current_page:1,link_string:"",max_page:null,page_string:"Page {current_page} of {max_page}",paged:function(){}};e.fn.jqPagination=function(){var t=this,n=Array.prototype.slice.call(arguments);if(typeof n[0]=="string"){t.length>1&&(t=t.eq(0));var r=e(t).data("jqPagination");return r.callMethod(n[0],n[1],n[2])}t.each(function(){new e.jqPagination(this,n[0])})}})(jQuery);if(!console){var console={},func=function(){return!1};console.log=func;console.info=func;console.warn=func;console.error=func};

public/libs/ui/themes/smoothness/jquery-ui.css

@@ -1,474 +0,0 @@
-/*! jQuery UI - v1.9.2 - 2012-11-23
-* http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
-* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
-.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
-.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; }
-
-.ui-autocomplete {
-	position: absolute;
-	top: 0;
-	left: 0;
-	cursor: default;
-}
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}
-.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-
-.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
-.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
-.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
-.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
-.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
-.ui-menu .ui-menu-item a.ui-state-focus,
-.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
-
-.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
-.ui-menu .ui-state-disabled a { cursor: default; }
-
-/* icon support */
-.ui-menu-icons { position: relative; }
-.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
-
-/* left-aligned */
-.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
-
-/* right-aligned */
-.ui-menu .ui-menu-icon { position: static; float: right; }
-
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }
-.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
-.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
-.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
-.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
-.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
-.ui-spinner-up { top: 0; }
-.ui-spinner-down { bottom: 0; }
-
-/* TR overrides */
-.ui-spinner .ui-icon-triangle-1-s {
-	/* need to fix icons sprite */
-	background-position:-65px -16px;
-}
-
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-
-.ui-tooltip {
-	padding: 8px;
-	position: absolute;
-	z-index: 9999;
-	max-width: 300px;
-	-webkit-box-shadow: 0 0 5px #aaa;
-	box-shadow: 0 0 5px #aaa;
-}
-/* Fades and background-images don't work well together in IE6, drop the image */
-* html .ui-tooltip {
-	background-image: none;
-}
-body .ui-tooltip { border-width: 2px; }
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }

public/libs/ui/themes/smoothness/jquery.ui.theme.css

@@ -1,248 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.9.2
- * http://jqueryui.com
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-on { background-position: -96px -144px; }
-.ui-icon-radio-off { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }

public/themes/default/scripts/scripts.js

@@ -5,6 +5,12 @@ $(document).ready(function(){
 		function(){ $('#control').css('display', 'none'); }
 	);*/
 	
+	$('img.flag').on('click', function() {
+		var url = window.location.href;
+		$.post('/user/lang', {lang: $(this).attr('id')}, function(data){
+			window.location.href = url;	
+		});
+	});
 	
 	$(window).scroll(function() {
 		var offset = $(window).scrollTop();

scripts/build/config/Odea/application.ini

@@ -19,7 +19,6 @@ resources.layout.layoutPath = APPLICATION_PATH "/views/default"
 resources.view.basePath = APPLICATION_PATH "/views/default"
 autoloaderNamespaces[] = "Application_"
 autoloaderNamespaces[] = "Scores_"
-autoloaderNamespaces[] = "Form_"
 
 ; Scores configuration
 profil.server.name = Odea

scripts/build/config/local/application.ini

@@ -19,7 +19,6 @@ resources.layout.layoutPath = APPLICATION_PATH "/views/default"
 resources.view.basePath = APPLICATION_PATH "/views/default"
 autoloaderNamespaces[] = "Application_"
 autoloaderNamespaces[] = "Scores_"
-autoloaderNamespaces[] = "Form_"
 
 ; Scores configuration
 profil.server.name = development

scripts/build/config/sdsrvdev01/application.ini

@@ -19,7 +19,6 @@ resources.layout.layoutPath = APPLICATION_PATH "/views/default"
 resources.view.basePath = APPLICATION_PATH "/views/default"
 autoloaderNamespaces[] = "Application_"
 autoloaderNamespaces[] = "Scores_"
-autoloaderNamespaces[] = "Form_"
 
 ; Scores configuration
 profil.server.name = development

scripts/jobs/enrichissement.php

@@ -101,9 +101,9 @@ $dico 	= new Enrichissement();
 $fields = $dico->getFields();
 
 //Entete, Valeur de remplacement et Requete SQL
-$tabEntete 		= array('siren', 'nic');
-$tabEnteteLabel = array('SIREN', 'NIC');
-$sql 			= 'SELECT LPAD(siren, 9, 000000000) AS siren, LPAD(nic,5,00000) AS nic,';
+$tabEntete 		= array('siret','siren', 'nic');
+$tabEnteteLabel = array('SIRET','SIREN', 'NIC');
+$sql 			= 'CONCAT(siren, nic) as siret, LPAD(siren, 9, 000000000) AS siren, LPAD(nic,5,00000) AS nic,';
 $from           = 'jo.etablissements_act';
 $addWhere       = '';
 foreach ( $dataProfil as $item ) {
@@ -120,24 +120,33 @@ foreach ( $dataProfil as $item ) {
 
 	//Pour les champs de type "code", ajouter le libellé
 	if ( array_key_exists('join', $fields[$item]) ) {
+		
 	    //Automatic column name .Lib
-	    $joinColumn = $item.'Lib';
-	    $tabEntete[] = $joinColumn;
+	    $joinColumn = $fields[$item]['join']['column'];
+	    $colName = $fields[$item]['column'].$joinColumn;
+	    $tabEntete[] = $colName;
 	    //label
 	    $tabEnteteLabel[] = $fields[$item]['join']['label'];
 	    //Sql
-	    $tableAlias = $item.'T';
-	    $sql.= $tableAlias.'.'.$fields[$item]['join']['column'].' AS '.$joinColumn;
-	    $from.= ','.$fields[$item]['join']['column'].' AS '.$tableAlias;
-	    $addWhere = ' AND WHERE '.$fields[$item]['column'].'='.$tableAlias.'.'.$fields[$item]['join']['column'];
+	    $tableAlias = array($fields[$item]['column'].'_'.$joinColumn=>$fields[$item]['join']['table']);
+	    $sql.= $fields[$item]['column'].'_'.$joinColumn.'.'.$joinColumn.' AS '.$colName.',';
+	    $join[]= array($tableAlias,$fields[$item]['join']['stat']);
 	}
 
 }
+
 //Ajouter le champ presentRcs
 $tabEntete[] 		= 'presentRcs';
 $tabEnteteLabel[] 	= 'RCS';
-$sql			    .= ' presentRcs';
+$sql			    .= ' presentRcs AS presentRcs';
 
+//add Tranche Effectif
+$teff_etab = $dico->getColumnValue('teff_etab');
+$teff_entrep = $dico->getColumnValue('teff_entrep');
+$tabEntete[] 		= 'teff_etabLib';
+$tabEntete[] 		= 'teff_entrepLib';
+$tabEnteteLabel[] 	= 'Libelle Tranche Effectif Etablissement ';
+$tabEnteteLabel[] 	= 'Libelle Tranche Effectif Entreprise';
 //Pour chaque identifiant traiter les données
 $row = 0;
 $fp = fopen($path.'/'.$outFile, 'w');
@@ -154,24 +163,52 @@ if ($opts->id) {
 		"id = ".$commande->id);
 }
 
+
+
 $model = $sql;
-$traite = 0;
+//print_r($model);exit;
 //Date de debut de traitement.
 $dateStart = date('YmdHms');
-foreach ($identifiants as $siret )
-{
-	$sql = $model.' FROM jo.etablissements_act WHERE siren='.substr($siret,0,9).' AND nic='.substr($siret,9,5);
-	try {
-		$result = $db->fetchAll($sql);
-		$traite++;
-	} catch(Exception $e) {
-		echo $sql;
+$db = Zend_Db_Table::getDefaultAdapter();
+$sql = $db->select()
+->from($from,$model);
+if($join){
+	foreach ($join as $params ){
+		$sql->joinLeft($params[0], $params[1],  array());
+		
 	}
-	$tabData = $result[0];
+}
+
+$where = '';
+foreach ($identifiants as $key=>$siret )
+{
+	if ($key>0) {
+		$where.=' OR ';
+	}
+	$where.="(siren='".substr($siret,0,9)."' AND nic='".substr($siret,9,5)."')";
+}
+$sql->where($where);
+try {
+	$result = $db->fetchAll($sql);
+	//print_r($result);exit;
+} catch(Exception $e) {
+	echo $e;
+}
+foreach ($result as $tabData) {
+	if (array_key_exists('teffetablissement', $tabData)) {
+		$tabData['teff_etabLib']=$teff_etab[$tabData['teffetablissement']];
+	} 
+	if(array_key_exists('teffentreprise', $tabData)){
+		$tabData['teff_entrepLib']=$teff_etab[$tabData['teffentreprise']];
+	}
+	if (array_key_exists('siege', $tabData)) {
+		($tabData[siege])?$tabData[siege]='Siège':$tabData[siege]='Secondaire';
+	}
+	
 	//Trier pour la sortie
 	$tabSortie = array();
 	foreach($tabEntete as $key){
-		$tabSortie[] = isset($tabData[$key]) ? $tabData[$key] : '';
+		$tabSortie[] = isset($tabData[$key]) ? $tabData[$key] : '';
 	}
 	fputcsv($fp, $tabSortie, ',', '"');
 

scripts/jobs/setMinMax.php

@@ -88,7 +88,7 @@ foreach($keys as $key) {
 
 	//Lecture
 	$sql = 'SELECT MIN('.$key.') AS min, MAX('.$key.') AS max FROM jo.etablissements_act';
-	$stmt = $dbMetier->query($sql);
+	$stmt = $db->query($sql);
 	$result = $stmt->fetchObject();
 
 	//Insertion