diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 148a470d..913e6123 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -17,15 +17,15 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headLink()
->appendStylesheet('/libs/qtip/jquery.qtip.css', 'all')
- ->appendStylesheet('/themes/jstree/default/style.css')
- ->appendStylesheet('/themes/jqueryui/jquery-ui.css', 'all')
+ ->appendStylesheet('/libs/tree/themes/default/style.css')
+ ->appendStylesheet('/libs/ui/themes/smoothness/jquery-ui.css', 'all')
->appendStylesheet($pathStyle.'/main.css', 'all');
$view->headScript()
- ->appendFile($pathScript.'/jquery.js', 'text/javascript')
- ->appendFile($pathScript.'/jquery.bgiframe.js', 'text/javascript')
- ->appendFile($pathScript.'/jquery.cookie.js', 'text/javascript')
- ->appendFile($pathScript.'/jquery-ui.js', 'text/javascript')
+ ->appendFile('/libs/jquery/jquery.js', 'text/javascript')
+ ->appendFile('/libs/jquery/jquery.bgiframe.js', 'text/javascript')
+ ->appendFile('/libs/jquery/jquery.cookie.js', 'text/javascript')
+ ->appendFile('/libs/ui/jquery-ui.js', 'text/javascript')
->appendFile('/libs/qtip/jquery.qtip.js', 'text/javascript')
->appendFile($pathScript.'/scripts.js', 'text/javascript');
diff --git a/application/controllers/EnrichissementController.php b/application/controllers/EnrichissementController.php
index 4b61f9e3..9a021923 100644
--- a/application/controllers/EnrichissementController.php
+++ b/application/controllers/EnrichissementController.php
@@ -14,7 +14,7 @@ class EnrichissementController extends Zend_Controller_Action
public function fileformAction()
{
- $this->view->headScript()->appendFile('/themes/default/scripts/jquery.form.js', 'text/javascript');
+ $this->view->headScript()->appendFile('/libs/form/jquery.form.js', 'text/javascript');
$this->view->headScript()->appendFile('/themes/default/scripts/jqueryprogressbar.js', 'text/javascript');
$this->view->assign('filesize', ini_get('upload_max_filesize'));
}
diff --git a/application/controllers/FieldsController.php b/application/controllers/FieldsController.php
index 35de6a4d..d6c7cfcc 100644
--- a/application/controllers/FieldsController.php
+++ b/application/controllers/FieldsController.php
@@ -7,7 +7,7 @@ class FieldsController extends Zend_Controller_Action
public function indexAction()
{
$this->view->headScript()
- ->appendFile('/themes/default/scripts/jquery.jstree.js', 'text/javascript')
+ ->appendFile('/libs/tree/jquery.jstree.js', 'text/javascript')
->appendFile('/themes/default/scripts/fields.js', 'text/javascript');
$field = new Scores_Fields();
@@ -98,7 +98,7 @@ class FieldsController extends Zend_Controller_Action
$i = 0;
foreach ($queries as $item) {
if (strlen($item)>2) {
- $where = 'LIKE "%'.strtolower($item).'%"';
+ $where.= 'LIKE "%'.strtolower($item).'%"';
}
$i++;
if (count($queries) < $i){
@@ -123,7 +123,7 @@ class FieldsController extends Zend_Controller_Action
$i = 0;
foreach ($queries as $item) {
if (strlen($item)>2) {
- $where = 'LIKE "%'.strtolower($item).'%"';
+ $where.= 'LIKE "%'.strtolower($item).'%"';
}
$i++;
if (count($queries) < $i){
@@ -148,7 +148,7 @@ class FieldsController extends Zend_Controller_Action
$i = 0;
foreach ($queries as $item) {
if (strlen($item)>2) {
- $where = 'LIKE "'.strtolower($item).'"';
+ $where.= 'LIKE "%'.strtolower($item).'%"';
}
$i++;
if (count($queries) < $i){
@@ -217,7 +217,6 @@ class FieldsController extends Zend_Controller_Action
}
$this->view->assign('output', $output);
}
-
public function checkvalue(){}
diff --git a/application/controllers/JuridiqueController.php b/application/controllers/JuridiqueController.php
deleted file mode 100644
index 0a7f688c..00000000
--- a/application/controllers/JuridiqueController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-view->fields = $field;
- }
-
- public function resetAction()
- {
- $this->_helper->layout()->disableLayout();
- $this->_helper->viewRenderer->setNoRender();
- $fields = new Scores_Fields();
- $fields->resetFamille('juridique');
- }
-
- public function completedAction()
- {
- $table = new Application_Model_FormeJuridique();
- $this->_helper->layout()->disableLayout();
- $this->_helper->viewRenderer->setNoRender();
- $request = $this->getRequest();
-
- $q = strtolower($request->getParam('q'));
-
- $separator = ' , ';
-
- $sql = $table->select()
- ->where('LOWER(fjLibelle) LIKE "%'.$q.'%"')
- ->where('LENGTH(fjCode) = 4');
- $result = $table->fetchAll($sql);
- foreach ($result as $item) {
- $output[] = array(
- 'label' => $item->fjLibelle . $separator . $item->fjCode,
- 'value' => $item->fjCode
- );
- }
- echo json_encode($output);
- }
-}
-
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 5d2a3d83..64e61904 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -8,8 +8,8 @@ class UserController extends Zend_Controller_Action
public function loginAction()
{
$this->view->inlineScript()
- ->appendFile('/themes/default/scripts/jquery.js')
- ->appendFile('/themes/default/scripts/jquery.infieldlabel.min.js');
+ ->appendFile('/libs/jquery/jquery.js')
+ ->appendFile('/libs/jquery/jquery.infieldlabel.min.js');
//@todo : gestion des affichages particuliers pour les clients
$this->view->headTitle()->append('Connexion');
@@ -50,13 +50,16 @@ class UserController extends Zend_Controller_Action
$message = $request->getParam('message');
$this->view->assign('message', $message);
+ $refresh = 5;
+
$url = 'http://'.$_SERVER['SERVER_NAME'].$this->view->url(array(
'controller' => 'user',
'action' => 'login',
));
$this->view->assign('url', $url);
- $this->view->headMeta()->appendHttpEquiv('refresh', '5; url='.$url);
+ $this->view->assign('refresh', $refresh);
+ $this->view->headMeta()->appendHttpEquiv('refresh', $refresh.'; url='.$url);
$this->render('logout');
}
diff --git a/application/views/default/helpers/Field.php b/application/views/default/helpers/Field.php
index 26fab78d..f3729c3b 100644
--- a/application/views/default/helpers/Field.php
+++ b/application/views/default/helpers/Field.php
@@ -46,7 +46,7 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$out.= '';
break;
case 'list':
- $out.= '';
+ $out.= '';
$out.= 'Liste';
$out.= '';
break;
diff --git a/application/views/default/scripts/comptage/savedialog.phtml b/application/views/default/scripts/comptage/savedialog.phtml
index f6dd0a48..b4a0ff10 100644
--- a/application/views/default/scripts/comptage/savedialog.phtml
+++ b/application/views/default/scripts/comptage/savedialog.phtml
@@ -19,7 +19,7 @@ Les espaces seront remplacés par "_"
-
+