(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 7a357079aabd7329bd0c4bf4a2dcdbb9167225ba..7bd7d2148066a7b3ab1734a6af5bc5ffce33353f 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -8,7 +8,7 @@ class extranetAjax {
                }\r
                $bouton = is_null($bouton)?__('Enregister'):$bouton;\r
                $colspan = $cols > 2?' colspan="' . ($cols-1) . '"':'';\r
-               $res = extranetPage::bh();\r
+               $res = commonPage::bh();\r
                $res .= '<form action="' . $action . '" method="post">';\r
                $res .= '<table class="form' . $class . '">';\r
                $res .= '<tr><th' . $colspan . '><strong>' . $core->typo->Titre($titre) . '</strong></th><th class="right"><a href="#" class="closePopup">' . cubeMedia::image(IMG . '/close.png') . '</a></th></tr>';\r
@@ -19,7 +19,7 @@ class extranetAjax {
                $res .= '</table>';\r
                $res .= $extra;\r
                $res .= '</form>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                echo $res;\r
                exit;\r
        }\r

diff --git a/inc/extranet/Controlleur/class.extranet.page.chiffres.php b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
index d1a38e1dfa83d28000132345f9f21a1615a4d9e5..7e6015fb65f37293d34b98339ced1e7fa03dadc9 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.page.chiffres.php
+++ b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
@@ -93,7 +93,7 @@ class extranetPageChiffres {
 \r
                $encours = $total_projets - $total_factures;\r
 \r
-               $res = extranetPage::bh();\r
+               $res = commonPage::bh();\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><th colspan="2"><strong>' . sprintf(__("Détails de l'année %s"), date('Y')) . '</strong></th><th colspan="2"><strong>' . __("Impayés") . '</strong></th></tr>';\r
                $res .= '<tr class="odd"><td>' . __('Projets en cours') . ' : </td><td>' . self::format($encours) . '</td><td>' . __('Total des impayés') . ' : </td><td>' . self::format($impayes) . '</td></tr>';\r
@@ -102,7 +102,7 @@ class extranetPageChiffres {
                // $res .= '<tr class="odd"><td>' . __('Total des charges') . ' ( <a href="#" class="popup" rel="chargesDetails">' . __('Voir le détail') . '</a> ) : </td><td>' . self::format($charges_payees) . '</td></tr>';\r
                // $res .= '<tr><td>' . __('Projets payés - Charges') . ' : </td><td>' . self::format($r->paye - $charges_payees) . '</td></tr>';\r
                $res .= '</table>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r
@@ -115,7 +115,7 @@ class extranetPageChiffres {
                while ($r->fetch()) {\r
                        $chiffres[$r->annee] = $r->ca;\r
                }\r
-               $res = extranetPage::bh();\r
+               $res = commonPage::bh();\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><td colspan="' . (count($chiffres) + 2) . '">';\r
                $res .= self::caChart($chiffres, $encours);\r
@@ -137,7 +137,7 @@ class extranetPageChiffres {
                $res .= '</tr>';\r
 \r
                $res .= '</table>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r
@@ -160,7 +160,7 @@ class extranetPageChiffres {
                        }\r
                }\r
                $annees = array_unique($annees);\r
-               $res = extranetPage::bh();\r
+               $res = commonPage::bh();\r
                $res .= '<table class="liste">';\r
 \r
                $res .= '<tr><td colspan="' . (count($annees) + 2) . '">';\r
@@ -201,7 +201,7 @@ class extranetPageChiffres {
                        $i++;\r
                }\r
                $res .= '</table>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r
@@ -277,7 +277,7 @@ class extranetPageChiffres {
                $annees = array_unique($annees);\r
                sort($annees);\r
 \r
-               $res = extranetPage::bh();\r
+               $res = commonPage::bh();\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><th><strong>' . __("Rapport Temps travaillé / Temps payé") . '</strong></th>';\r
                foreach($annees as $annee) {\r
@@ -329,7 +329,7 @@ class extranetPageChiffres {
                $res .= '<td><strong><em>' . self::format($c, false) . ' / ' . self::format($p, false) . ' (' . round(($c / $p) * 100) . ' %)</em></strong></td>';\r
                $res .= '</tr>';\r
                $res .= '</table>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index afb8eb2f4608e6bf1341fbd6cbdd5d3b3b9aa136..e1d1d2a5700bc48784e51ea8b0fa765852e66b2f 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -34,7 +34,7 @@ class extranetUrl {
                        $order = array('wsUrl', 'extranetUrl');\r
                }\r
 \r
-               echo extranetPage::header($args);\r
+               echo commonPage::header($args);\r
 \r
                foreach($order as $class) {\r
                        $cb = array($class, $f);\r
@@ -43,7 +43,7 @@ class extranetUrl {
                                break;\r
                        }\r
                }\r
-               echo extranetPage::footer();\r
+               echo commonPage::footer();\r
        }\r
 \r
        public static function login($args)\r
@@ -57,9 +57,9 @@ class extranetUrl {
 \r
                $message = $tentative?'<p class="message"><br />' . __('Identifiants incorrects') . '</p>':'';\r
 \r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div class="form">';\r
                $res .= '<form action="" method="post" class="notajax">';\r
                $res .= '<h1>' . $core->typo->Titre(__('Veuillez vous identifier')) . '</h1>';\r
@@ -72,8 +72,8 @@ class extranetUrl {
                $res .= '</table>';\r
                $res .= '</form>';\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -156,14 +156,14 @@ class extranetUrl {
                $filtres = array();\r
                $filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
-               $res = extranetPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeClients">';\r
                $res .= self::listeClients();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -230,7 +230,7 @@ class extranetUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -426,14 +426,14 @@ class extranetUrl {
                $filtres[] = new extranetFiltre(__('Status'), 'status_projet', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Année'), 'annee', $settings['filtres']);\r
 \r
-               $res = extranetPage::barre($filtres, 'filtreProjet', 'projets', $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres, 'filtreProjet', 'projets', $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeProjets">';\r
                $res .= self::listeProjets();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -533,7 +533,7 @@ class extranetUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="11">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -550,14 +550,14 @@ class extranetUrl {
                $shortcuts[] = '<a href="#" class="popup" rel="formTacheNormale/new/' . $args[1] . '">' . $core->typo->Ajouter('Créer une tâche') . '</a>';\r
                $shortcuts[] = '<a href="#" class="popup" rel="formTacheSousTraitee/new/' . $args[1] . '">' . $core->typo->Ajouter('Créer une tâche sous-traitée') . '</a>';\r
 \r
-               $res = extranetPage::barre(null, null, null, $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre(null, null, null, $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeProjet">';\r
                $res .= self::listeProjet($args[1]);\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -764,14 +764,14 @@ class extranetUrl {
                $settings = $core->user->getSettings('timereport');\r
                $filtres = array();\r
                $filtres[] = new extranetFiltre(__('Participants'), 'equipier_participe', $settings['filtres']);\r
-               $res = extranetPage::barre($filtres, 'filtreTimereport', 'timereport', null);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres, 'filtreTimereport', 'timereport', null);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeTimereport">';\r
                $res .= self::listeTimereport();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -863,7 +863,7 @@ class extranetUrl {
 \r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $res .= '<tr><td colspan="22"> ';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->countActifs(), $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->countActifs(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
                        $res .= ' </td></tr>';\r
                }\r
@@ -905,14 +905,14 @@ class extranetUrl {
                $filtres[] = new extranetFiltre(__('Status'), 'status_devis', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
 \r
-               $res = extranetPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeDevis">';\r
                $res .= self::listeDevis();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -920,14 +920,14 @@ class extranetUrl {
        {\r
                global $core;\r
 \r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeDevis">';\r
                $res .= self::listeDevis();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1029,7 +1029,7 @@ class extranetUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('devis'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -1086,12 +1086,12 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= self::formDevis($args[1]);\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1232,12 +1232,12 @@ class extranetUrl {
                $createur = $devis->createur = $daoUtilisateur->selectById($devis->createur_id);\r
                $client = $devis->client = $daoUtilisateur->selectById($devis->client_id);\r
 \r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<iframe src="' . SITE_PATH . 'voirdevis/' . $devis->devis_id . '/?junk=' . TIME . '" width="960" height="1000" frameborder="0"></iframe>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="devis_email">';\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><td>' . __('De') . '</td><td>' . $createur->prenom . ' ' . $createur->nom . '&lt;' . $createur->email . '&gt;</td></tr>';\r
@@ -1250,8 +1250,8 @@ class extranetUrl {
                $res .= '<a href="#" rel="expedieDevis/1/' . $devis->devis_id . '" class="ajax" title="' . __("Le devis est sur le point d'être envoyé. Veuillez confirmer votre choix ?") . '">' . $core->typo->BoutonOK(__('Valider et envoyer le devis')) . '</a></td></tr>';\r
                $res .= '</table>';\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1274,28 +1274,28 @@ class extranetUrl {
                $filtres[] = new extranetFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Status'), 'status_facture', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
-               $res = extranetPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeFactures">';\r
                $res .= self::listeFactures();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
        public static function factures_client($args)\r
        {\r
                global $core;\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeFactures">';\r
                $res .= self::listeFactures();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1420,9 +1420,9 @@ class extranetUrl {
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">' ;\r
                        if ($core->user->grade != 3) {\r
-                               $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        } else {\r
-                               $res .= extranetPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');\r
                        }\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('factures'));\r
                        $res .= '</td></tr>';\r
@@ -1496,16 +1496,16 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                if (isset($args[2])) {\r
                        $res .= self::formFacture($args[1], $args[2]);\r
                } else {\r
                        $res .= self::formFacture($args[1]);\r
                }\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1647,9 +1647,9 @@ class extranetUrl {
                $dao = new extranetDAOFacture($core->con);\r
                $facture = $dao->selectById($args[1]);\r
 \r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<iframe src="' . SITE_PATH . 'voirfacture/' . $facture->facture_id . '" width="960" height="1000" frameborder="0"></iframe>';\r
 \r
                $res .= '<div class="right">' . '<a href="' . SITE_PATH . 'editefacture/' . $facture->facture_id . '">' . $core->typo->BoutonOK(__('Editer la facture')) . '</a> ';\r
@@ -1659,8 +1659,8 @@ class extranetUrl {
                        $res .= '<a href="' . SITE_PATH . 'factures">' . $core->typo->BoutonOK(__('Valider la facture')) . '</a>';\r
                }\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1681,11 +1681,11 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(2);\r
-               // $res = extranetPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));\r
-               $res = extranetPage::barre(null, null, null, null);\r
-               $res .= extranetPage::tMain();\r
+               // $res = commonPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));\r
+               $res = commonPage::barre(null, null, null, null);\r
+               $res .= commonPage::tMain();\r
                $res .= extranetPageChiffres::listeChiffres();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1712,10 +1712,10 @@ class extranetUrl {
        {\r
                extranetDroits::min(1);\r
                cubePage::ui('Sortable');\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain('dash');\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain('dash');\r
                $res .= self::listeDashboard($args);\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1744,7 +1744,7 @@ class extranetUrl {
                $res .= '<a href="#" rel="formDashboard/d/' . $r->dashboard_id . '" class="edit popup">' . cubeMedia::image(IMG . '/edit.png') . '</a>';\r
                $res .= '<a href="#" rel="delDashboard/' . $r->dashboard_id . '" class="ajax delete" title="' . __('Êtes vous certain de vouloir supprimer cette liste de votre dashboard ?') . '">' . cubeMedia::image(IMG . '/delete.png') . '</a>';\r
                $res .= '</div>';\r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= '<div' . $hide . '>';\r
                if ($r->rubrique == 'projets') {\r
                        $res .= self::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings));\r
@@ -1758,7 +1758,7 @@ class extranetUrl {
                        $res .= self::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                }\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
 \r
                return $res;\r
        }\r
@@ -1841,17 +1841,17 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain("traduction");\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain("traduction");\r
+               $res .= commonPage::bh();\r
                $res .= '<form action="saveTrad" method="post">';\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><th>' . __("Traduction de l'application en anglais") . '</th><th></th></tr>';\r
                $res .= '</table>';\r
                $res .= cubeLang::translationForm(ROOT . '/inc/extranet', 'en' , ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');\r
                $res .= '</form>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1891,14 +1891,14 @@ class extranetUrl {
        {\r
                global $core;\r
                extranetDroits::min(2);\r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain("rh");\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain("rh");\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeEquipiers">';\r
                $res .= extranetUrl::listeRh(null, null);\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -1940,7 +1940,7 @@ class extranetUrl {
                /*if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }*/\r
@@ -1965,22 +1965,22 @@ class extranetUrl {
                $filtres = array();\r
                $res = '';\r
                if ($core->user->grade != 0) {\r
-                       $res .= extranetPage::barre(null, null, null, array('<a href="ftp://' . $client->email . ':' . $client->password . '@extranet.cubedesigners.com/" class="blank">' . $core->typo->BoutonOK(__('Accès direct FTP')) . '</a>'));\r
+                       $res .= commonPage::barre(null, null, null, array('<a href="ftp://' . $client->email . ':' . $client->password . '@extranet.cubedesigners.com/" class="blank">' . $core->typo->BoutonOK(__('Accès direct FTP')) . '</a>'));\r
                } else {\r
-                       $res .= extranetPage::barre();\r
+                       $res .= commonPage::barre();\r
                }\r
-               $res .= extranetPage::tMain();\r
+               $res .= commonPage::tMain();\r
                if ($core->user->grade == 0) {\r
                        $res .= self::formFichier();\r
                } else {\r
                        $res .= self::formFichier($args[1]);\r
                }\r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeFichiers">';\r
                $res .= self::listeFichiers($settings);\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -2000,7 +2000,7 @@ class extranetUrl {
 \r
                $res = '<div class="dashboard">';\r
                $res .= '<div class="caption">' . $core->typo->OngletBlancNoDash($titre) . '</div>';\r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= '<div class="gris form">';\r
                $res .= '<h1>' . $texte . '</h1>';\r
 \r
@@ -2018,7 +2018,7 @@ class extranetUrl {
 \r
                $res .= cubeMedia::flash(WEBROOT . '/swf/uploader.swf', '970', '50', $fv, 'uploaderContainer', '', '9', '#ffffff', '', 'true', 'noscale', 'transparent');\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                $res .= '</div>';\r
                return $res;\r
        }\r
@@ -2072,7 +2072,7 @@ class extranetUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="12">' ;\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('fichiers'));\r
                        $res .= '</td></tr>';\r
                }\r

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 4e5518b40b32ed593f63df5d22c1c527b583a7c3..8a42b618ac11325b63ac5517320514ef1d5290ad 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -52,8 +52,8 @@ class wsStats {
                        $listeShortcuts[] = $listeMois;\r
                }\r
 \r
-               $res = extranetPage::barre($listeShortcuts, 'filtreStats', 'stats', $actions);\r
-               $res .= extranetPage::tMain();\r
+               $res = commonPage::barre($listeShortcuts, 'filtreStats', 'stats', $actions);\r
+               $res .= commonPage::tMain();\r
                if (is_null($annee) && is_null($mois)) {\r
                        $res .= self::vue_globale($bid);\r
                } elseif (is_null($mois)) {\r
@@ -61,7 +61,7 @@ class wsStats {
                } else {\r
                        $res .= self::vue_mensuelle($bid, $annee, $mois);\r
                }\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -361,9 +361,9 @@ class wsStats {
 \r
        public static function indisponible()\r
        {\r
-               $res = extranetPage::bh('stats_global');\r
+               $res = commonPage::bh('stats_global');\r
                $res .= '<p class="center">' . __('Les statistiques concernant cette période ne sont actuellement pas disponibles') . '</p>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r
@@ -390,12 +390,12 @@ class wsStats {
                }\r
 \r
                self::getActives($stats, $book, $aextra, $adown, $adownp, $aprint, $afriend);\r
-               $res = extranetPage::bh('stats_global');\r
+               $res = commonPage::bh('stats_global');\r
                $titre = __('Statistiques de la publication « %s »');\r
                $date_creation = __('Date de création de la publication');\r
                $res .= self::globalDatas(sprintf($titre, $book->nom), $date_creation, $book, $stats, $afriend, $aprint, $adown, $adownp, $aextra);\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bh();\r
                $res .= '<table class="liste max">';\r
                $res .= '<tr><th>' . $core->typo->Titre(__('Détail par mois')) . '</th></tr>';\r
                $res .= '<tr><th>';\r
@@ -409,7 +409,7 @@ class wsStats {
                $res .= '</th></tr>';\r
                $res .= '</table>';\r
                $res .= self::detailPeriode($book, $stats, $bid, $annee);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                return $res;\r
        }\r
 \r
@@ -437,22 +437,22 @@ class wsStats {
 \r
                self::getActives($stats, $book, $aextra, $adown, $adownp, $aprint, $afriend);\r
                $time_page = mktime(0, 0, 0, $mois, 15, $annee);\r
-               $res = extranetPage::bh('stats_global');\r
+               $res = commonPage::bh('stats_global');\r
                $titre = __('Statistiques de la publication « %s »');\r
                $date_creation = __('Date de création de la publication');\r
                $res .= self::globalDatas(sprintf($titre, $book->nom), $date_creation, $book, $stats, $afriend, $aprint, $adown, $adownp, $aextra);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                // .\r
-               $res .= extranetPage::bh('stats_detail_mois');\r
+               $res .= commonPage::bh('stats_detail_mois');\r
                $res .= '<div class="center" style="width:944px;position:relative;">' ;\r
                $res .= self::graph_mensuel($bid, $annee, $mois, $stats);\r
                $res . '</div>';\r
                $res .= self::detailJour($book, $stats);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                // .\r
-               $res .= extranetPage::bh('stats_detail_pages');\r
+               $res .= commonPage::bh('stats_detail_pages');\r
                $res .= self::detailPages($book, $stats);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                // .\r
                if ($book->parametres->search == 0) {\r
                        $idl = 'stats_links_2';\r
@@ -463,18 +463,18 @@ class wsStats {
                }\r
 \r
                $res .= '<div id="stats_30">';\r
-               $res .= extranetPage::bh($idl);\r
+               $res .= commonPage::bh($idl);\r
                $res .= self::detailLiens($book, $stats);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                if ($book->parametres->search == 1) {\r
-                       $res .= extranetPage::bh('stats_search');\r
+                       $res .= commonPage::bh('stats_search');\r
                        $res .= self::detailSearch($book, $stats);\r
-                       $res .= extranetPage::bf();\r
+                       $res .= commonPage::bf();\r
                }\r
                // Origine\r
-               $res .= extranetPage::bh($idc);\r
+               $res .= commonPage::bh($idc);\r
                $res .= self::detailOrigine($book, $stats);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                $res .= '</div>';\r
                return $res;\r
        }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index abc398e245c143c2ced38ff1a2cada852cf61d16..db3e4e67d8453a98f75ef0291dcdfadc481b3679 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -12,14 +12,14 @@ class wsUrl {
                $filtres = array();\r
                $filtres[] = new extranetFiltre(__('Status'), 'status_book', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Année'), 'annee_book', $settings['filtres']);\r
-               $res = extranetPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);\r
-               $res .= extranetPage::tMain(null, true);\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);\r
+               $res .= commonPage::tMain(null, true);\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeBooks">';\r
                $res .= self::listeBooks();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -78,7 +78,7 @@ class wsUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="12">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('publications'), false);\r
                        $res .= '</td></tr>';\r
                }\r
@@ -110,22 +110,22 @@ class wsUrl {
 \r
                $langs = array(__('Langues configurées') => array_flip($existingLangs), __('Autres langues') => array_flip($allLangs));\r
 \r
-               $res = extranetPage::barre();\r
-               $res .= extranetPage::tMain(null, false);\r
+               $res = commonPage::barre();\r
+               $res .= commonPage::tMain(null, false);\r
 \r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= '<form action="changeLang" method="post" class="submitonchange">';\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', $langs, $args[1]) . ' </td></tr>';\r
                // $res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';\r
                $res .= '</table>';\r
                $res .= '</form>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
 \r
                $res .= '<div id="formLang">';\r
                $res .= self::formLang($args[1]);\r
                $res .= '</div>';\r
-               $res .= extranetPage::bMain(true);\r
+               $res .= commonPage::bMain(true);\r
 \r
                return $res;\r
        }\r
@@ -138,17 +138,17 @@ class wsUrl {
 \r
                $res = '<form action="saveLang" method="post">';\r
 \r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= '<table class="liste">';\r
                $res .= '<tr><td>' . __('Police de caractères') . ' : </td><td>' . form::hidden('lang', $lang_id) . form::combo('font', self::getFonts(), $lang->font) . '</td></tr>';\r
                $res .= '<tr class="odd"><td>' . __('Jeux de caractères') . ' : </td><td>' . form::combo('charset', self::getCharsets(), $lang->charset) . '</td></tr>';\r
                $res .= '<tr><td colspan="2" class="right"><a href="#" class="submit">' . $core->typo->Ajouter('Valider') . '</a></td></tr>';\r
                $res .= '</table>';\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
 \r
-               $res .= extranetPage::bh();\r
+               $res .= commonPage::bh();\r
                $res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
-               $res .= extranetPage::bf();\r
+               $res .= commonPage::bf();\r
                $res .= '</form>';\r
                return $res;\r
        }\r
@@ -382,14 +382,14 @@ html{height:100%}' . "\n";
                $filtres = array();\r
                $filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);\r
                $filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);\r
-               $res = extranetPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
-               $res .= extranetPage::tMain();\r
-               $res .= extranetPage::bh();\r
+               $res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);\r
+               $res .= commonPage::tMain();\r
+               $res .= commonPage::bh();\r
                $res .= '<div id="listeClients">';\r
                $res .= self::listeClients();\r
                $res .= '</div>';\r
-               $res .= extranetPage::bf();\r
-               $res .= extranetPage::bMain();\r
+               $res .= commonPage::bf();\r
+               $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
@@ -437,7 +437,7 @@ html{height:100%}' . "\n";
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }\r