diff --git a/application/Bootstrap.php b/application/Bootstrap.php index 067cf487..37fad0dd 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -58,33 +58,4 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap Zend_Registry::set('db', $db); } - protected function _initAutoload() - { - require_once APPLICATION_PATH . '/../library/Zend/Loader/Autoloader.php'; - - $appPath = realpath(dirname(__FILE__)); - $rootPath = dirname($appPath); - $autoload = Zend_Loader_Autoloader::getInstance(); - - $application = new Zend_Loader_Autoloader_Resource(array( - 'basePath' => $appPath . '/modules/frontend/models/', - 'namespace' => '', - 'resourceTypes' => array('tables'=>array('path'=>'Tables/','namespace'=>'Table'), - 'objects'=>array('path'=>'Objects/', 'namespace'=>'Object'), - 'forms'=>array('path'=>'Forms/', 'namespace'=>'Form') - ))); - - $libs = new Zend_Loader_Autoloader_Resource(array( - 'basePath' => $rootPath . '/library', - 'namespace' => 'library', - 'resourceTypes' => array('libs'=>array('path'=>'libs/','namespace'=>'Libs'), - ))); - - $loader = new Zend_Application_Module_Autoloader(array( - 'namespace' => '', - 'basePath' => APPLICATION_PATH)); - - return $loader; - } -} - +} \ No newline at end of file diff --git a/application/controllers/EconomiqueController.php b/application/controllers/EconomiqueController.php index dca253d0..fc004134 100644 --- a/application/controllers/EconomiqueController.php +++ b/application/controllers/EconomiqueController.php @@ -9,7 +9,6 @@ class EconomiqueController extends Zend_Controller_Action public function indexAction() { require_once('Scores/Field.php'); - $this->view->headLink()->appendStylesheet('/themes/default/styles/'.$this->getRequest()->getControllerName().'.css', 'all'); $field = new Fields(); $this->view->fields = $field; } diff --git a/application/controllers/EntrepriseController.php b/application/controllers/EntrepriseController.php index 076429d4..cbad1276 100644 --- a/application/controllers/EntrepriseController.php +++ b/application/controllers/EntrepriseController.php @@ -9,7 +9,6 @@ class EntrepriseController extends Zend_Controller_Action public function indexAction() { require_once('Scores/Field.php'); - $this->view->headLink()->appendStylesheet('/themes/default/styles/'.$this->getRequest()->getControllerName().'.css', 'all'); $field = new Fields(); $this->view->fields = $field; } diff --git a/application/controllers/FinancierController.php b/application/controllers/FinancierController.php index d1147461..3f7760e5 100644 --- a/application/controllers/FinancierController.php +++ b/application/controllers/FinancierController.php @@ -10,7 +10,6 @@ class FinancierController extends Zend_Controller_Action public function indexAction() { require_once('Scores/Field.php'); - $this->view->headLink()->appendStylesheet('/themes/default/styles/'.$this->getRequest()->getControllerName().'.css', 'all'); $auth = Zend_Auth::getInstance(); $user = $auth->getIdentity(); $field = new Fields(); diff --git a/application/controllers/GeographiqueController.php b/application/controllers/GeographiqueController.php index 005fac0a..1e7f9b88 100644 --- a/application/controllers/GeographiqueController.php +++ b/application/controllers/GeographiqueController.php @@ -10,7 +10,6 @@ class GeographiqueController extends Zend_Controller_Action public function indexAction() { require_once('Scores/Field.php'); - $this->view->headLink()->appendStylesheet('/themes/default/styles/'.$this->getRequest()->getControllerName().'.css', 'all'); $auth = Zend_Auth::getInstance(); $user = $auth->getIdentity(); $field = new Fields(); diff --git a/application/controllers/JuridiqueController.php b/application/controllers/JuridiqueController.php index ce67ff1a..024a96c0 100644 --- a/application/controllers/JuridiqueController.php +++ b/application/controllers/JuridiqueController.php @@ -10,7 +10,6 @@ class JuridiqueController extends Zend_Controller_Action public function indexAction() { require_once('Scores/Field.php'); - $this->view->headLink()->appendStylesheet('/themes/default/styles/'.$this->getRequest()->getControllerName().'.css', 'all'); $field = new Fields(); $this->view->fields = $field; } diff --git a/public/themes/default/styles/economique.css b/public/themes/default/styles/economique.css deleted file mode 100644 index c939085b..00000000 --- a/public/themes/default/styles/economique.css +++ /dev/null @@ -1,60 +0,0 @@ -#economique -{ - font-size:13px; - text-shadow: 1px 1px 1px white; -} - -#economique select { - width:80px; -} - -#economique li { - height:20px; - padding:5px; - border:1px solid silver; - margin-top:2px; - background-image:url('/themes/default/images/stripe.png'); - background-repeat: repeat-x; -} - -#economique li:hover { - background-image:url('/themes/default/images/stripe-hover.png'); - background-repeat: repeat-x; -} - -#link -{ - text-align:right; - margin-top:20px; - font-size:13px; -} - -#economique .interval input[type=text] -{ - width:100px; -} - -#economique select.intervalSelect -{ - width:102px; -} - -#economique select -{ - width:265px; -} - -.error { - display:block; - border:1px solid red; - height:40px; - background-color:#F8C5C5; - margin-bottom:5px; -} - -.error div { - margin-top:12px; - margin-left:5px; - color:red; - text-shadow: 1px 1px white; -} \ No newline at end of file diff --git a/public/themes/default/styles/entreprise.css b/public/themes/default/styles/entreprise.css deleted file mode 100644 index 53867dd7..00000000 --- a/public/themes/default/styles/entreprise.css +++ /dev/null @@ -1,56 +0,0 @@ -#entreprise -{ - font-size:13px; - text-shadow: 1px 1px 1px white; -} - -#entreprise select { - width:70%; -} - -#entreprise li { - height:20px; - padding:5px; - border:1px solid silver; - margin-top:2px; - background-image:url('/themes/default/images/stripe.png'); - background-repeat: repeat-x; -} - -#entreprise li:hover { - background-image:url('/themes/default/images/stripe-hover.png'); - background-repeat: repeat-x; -} - -#entreprise li input { - width:125px; -} - -#link -{ - text-align:right; - margin-top:20px; - font-size:13px; -} - -#entreprise .interval input[type=text] -{ - width:100px; -} - -#entreprise select.intervalSelect -{ - width:102px; -} - -#entreprise select -{ - width:265px; - border:1px solid silver; -} - -.resetFamille -{ - cursor:pointer; - text-decoration: underline; -} diff --git a/public/themes/default/styles/financier.css b/public/themes/default/styles/financier.css deleted file mode 100644 index 44bd0f1c..00000000 --- a/public/themes/default/styles/financier.css +++ /dev/null @@ -1,65 +0,0 @@ -#financiere -{ - font-size:13px; - text-shadow: 1px 1px 1px white; -} - -#financiere select { - width:80px; -} - -#financiere li { - height:20px; - padding:5px; - border:1px solid silver; - margin-top:2px; - background-image:url('/themes/default/images/stripe.png'); - background-repeat: repeat-x; -} - -#financiere li:hover { - background-image:url('/themes/default/images/stripe-hover.png'); - background-repeat: repeat-x; -} - -#financiere select -{ - width:100%; -} - -#link -{ - text-align:right; - margin-top:20px; - font-size:13px; -} - -#financiere .interval input[type=text] -{ - width:100px; -} - -#financiere select.intervalSelect -{ - width:102px; -} - -#financiere select -{ - width:265px; -} - -.error { - display:block; - border:1px solid red; - height:40px; - background-color:#F8C5C5; - margin-bottom:5px; -} - -.error div { - margin-top:12px; - margin-left:5px; - color:red; - text-shadow: 1px 1px white; -} \ No newline at end of file diff --git a/public/themes/default/styles/geographique.css b/public/themes/default/styles/geographique.css deleted file mode 100644 index 896ce4b1..00000000 --- a/public/themes/default/styles/geographique.css +++ /dev/null @@ -1,50 +0,0 @@ -#geographique -{ - font-size:13px; - text-shadow: 1px 1px 1px white; -} - -#geographique select { - width:70%; -} - -#geographique li { - height:20px; - padding:5px; - border:1px solid silver; - margin-top:2px; - background-image:url('/themes/default/images/stripe.png'); - background-repeat: repeat-x; -} - -#geographique li:hover { - background-image:url('/themes/default/images/stripe-hover.png'); - background-repeat: repeat-x; -} - -#link -{ - text-align:right; - margin-top:20px; - font-size:13px; -} - -#geographique .interval input[type=text] -{ - width:100px; -} - -.error { - display:block; - border:1px solid red; - height:40px; - background-color:#F8C5C5; - margin-bottom:5px; -} - -.error div { - margin-top:12px; - margin-left:5px; - color:red; - text-shadow: 1px 1px white; -} \ No newline at end of file diff --git a/public/themes/default/styles/juridique.css b/public/themes/default/styles/juridique.css deleted file mode 100644 index 50076834..00000000 --- a/public/themes/default/styles/juridique.css +++ /dev/null @@ -1,60 +0,0 @@ -#juridique -{ - font-size:13px; - text-shadow: 1px 1px 1px white; -} - -#juridique select { - width:80px; -} - -#juridique li { - height:20px; - padding:5px; - border:1px solid silver; - margin-top:2px; - background-image:url('/themes/default/images/stripe.png'); - background-repeat: repeat-x; -} - -#juridique li:hover { - background-image:url('/themes/default/images/stripe-hover.png'); - background-repeat: repeat-x; -} - -#link -{ - text-align:right; - margin-top:20px; - font-size:13px; -} - -#juridique .interval input[type=text] -{ - width:100px; -} - -#juridique select.intervalSelect -{ - width:102px; -} - -#juridique select -{ - width:265px; -} - -.error { - display:block; - border:1px solid red; - height:40px; - background-color:#F8C5C5; - margin-bottom:5px; -} - -.error div { - margin-top:12px; - margin-left:5px; - color:red; - text-shadow: 1px 1px white; -} \ No newline at end of file diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css index 0af782e3..87084606 100644 --- a/public/themes/default/styles/main.css +++ b/public/themes/default/styles/main.css @@ -376,4 +376,227 @@ table.ciblage td { { color:white; text-decoration: none; +} + +#economique +{ + font-size:13px; + text-shadow: 1px 1px 1px white; +} + +#economique select { + width:80px; +} + +#economique li { + height:20px; + padding:5px; + border:1px solid silver; + margin-top:2px; + background-image:url('/themes/default/images/stripe.png'); + background-repeat: repeat-x; +} + +#economique li:hover { + background-image:url('/themes/default/images/stripe-hover.png'); + background-repeat: repeat-x; +} + +#link +{ + text-align:right; + margin-top:20px; + font-size:13px; +} + +#economique .interval input[type=text] +{ + width:100px; +} + +#economique select.intervalSelect +{ + width:102px; +} + +#economique select +{ + width:265px; +} + +.error { + display:block; + border:1px solid red; + height:40px; + background-color:#F8C5C5; + margin-bottom:5px; +} + +.error div { + margin-top:12px; + margin-left:5px; + color:red; + text-shadow: 1px 1px white; +} + +#entreprise +{ + font-size:13px; + text-shadow: 1px 1px 1px white; +} + +#entreprise select { + width:70%; +} + +#entreprise li { + height:20px; + padding:5px; + border:1px solid silver; + margin-top:2px; + background-image:url('/themes/default/images/stripe.png'); + background-repeat: repeat-x; +} + +#entreprise li:hover { + background-image:url('/themes/default/images/stripe-hover.png'); + background-repeat: repeat-x; +} + +#entreprise li input { + width:125px; +} + +#entreprise .interval input[type=text] +{ + width:100px; +} + +#entreprise select.intervalSelect +{ + width:102px; +} + +#entreprise select +{ + width:265px; + border:1px solid silver; +} + +.resetFamille +{ + cursor:pointer; + text-decoration: underline; +} + +#financiere +{ + font-size:13px; + text-shadow: 1px 1px 1px white; +} + +#financiere select { + width:80px; +} + +#financiere li { + height:20px; + padding:5px; + border:1px solid silver; + margin-top:2px; + background-image:url('/themes/default/images/stripe.png'); + background-repeat: repeat-x; +} + +#financiere li:hover { + background-image:url('/themes/default/images/stripe-hover.png'); + background-repeat: repeat-x; +} + +#financiere select +{ + width:100%; +} + +#financiere .interval input[type=text] +{ + width:100px; +} + +#financiere select.intervalSelect +{ + width:102px; +} + +#financiere select +{ + width:265px; +} + +#geographique +{ + font-size:13px; + text-shadow: 1px 1px 1px white; +} + +#geographique select { + width:70%; +} + +#geographique li { + height:20px; + padding:5px; + border:1px solid silver; + margin-top:2px; + background-image:url('/themes/default/images/stripe.png'); + background-repeat: repeat-x; +} + +#geographique li:hover { + background-image:url('/themes/default/images/stripe-hover.png'); + background-repeat: repeat-x; +} + +#geographique .interval input[type=text] +{ + width:100px; +} + +#juridique +{ + font-size:13px; + text-shadow: 1px 1px 1px white; +} + +#juridique select { + width:80px; +} + +#juridique li { + height:20px; + padding:5px; + border:1px solid silver; + margin-top:2px; + background-image:url('/themes/default/images/stripe.png'); + background-repeat: repeat-x; +} + +#juridique li:hover { + background-image:url('/themes/default/images/stripe-hover.png'); + background-repeat: repeat-x; +} + +#juridique .interval input[type=text] +{ + width:100px; +} + +#juridique select.intervalSelect +{ + width:102px; +} + +#juridique select +{ + width:265px; } \ No newline at end of file