(no commit message)

diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 41000c8dbe7cfabb886ce2692ac49edc320052b5..dbf69bfa59ffc4059f70b2a6e65be6830f826423 100644 (file)
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -1,7 +1,8 @@
 <?php\r
+\r
 class commonPage {\r
-       public static function header($args)\r
-       {\r
+\r
+       public static function header($args) {\r
                global $js;\r
                global $core;\r
                // Entête HTML\r
@@ -21,7 +22,7 @@ class commonPage {
                if ($core->user) {\r
                        $search = self::search($args);\r
 \r
-                       $class = $search?' class="with-search"':'';\r
+                       $class = $search ? ' class="with-search"' : '';\r
                        // Le message personnalisé avec un lien pour se déconnecter\r
                        $res .= '<div id="welcome"' . $class . '>' . __('Bienvenue') . ' ' . $core->user->prenom . ' ' . $core->user->nom . ' ';\r
                        $res .= '| <a href="#" class="popup" rel="mesParametres">' . __('Mes paramètres') . '</a> ';\r
@@ -39,8 +40,7 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function search($args)\r
-       {\r
+       public static function search($args) {\r
                global $core;\r
 \r
                if (!commonDroits::recherche($args[0])) {\r
@@ -50,7 +50,7 @@ class commonPage {
                $settings = $core->user->getSettings($args[0]);\r
                $action = 'search' . ucfirst($args[0]);\r
 \r
-               $default = isset($_POST['q'])?$_POST['q']:__('Rechercher');\r
+               $default = isset($_POST['q']) ? $_POST['q'] : __('Rechercher');\r
                // Formulaire de recherche\r
                $res = '<form action="' . $action . '" method="post">';\r
                $res .= '<div id="search">' . form::field('q', 20, 128, $default, 'empty_field') . '<a href="#" class="submit">' . cubeMedia::spacer(22, 22) . '</a></div>';\r
@@ -58,8 +58,7 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function nav($args)\r
-       {\r
+       public static function nav($args) {\r
                // Barre d'onglets\r
                global $core;\r
                // Liste des onglets\r
@@ -78,17 +77,16 @@ class commonPage {
                $supp = array('stats' => 'publications');\r
 \r
                $res = '<div id="nav">';\r
-               foreach($onglets as $titre => $url) {\r
+               foreach ($onglets as $titre => $url) {\r
                        // Si cet onglet correspond à la page active, on le place actif\r
-                       $active = ($args[0] == $url || (isset($supp[$args[0]]) && $supp[$args[0]] == $url))?' class="active"':'';\r
+                       $active = ($args[0] == $url || (isset($supp[$args[0]]) && $supp[$args[0]] == $url)) ? ' class="active"' : '';\r
                        $res .= '<a href="' . SITE_PATH . $url . '"' . $active . '>' . cubeMedia::cssRollover($core->typo->Onglet($titre, '', false)) . '</a>';\r
                }\r
                $res .= '</div>';\r
                return $res;\r
        }\r
 \r
-       public static function barre($filtres = null, $action = null, $dashboard = null, $shortcuts = null)\r
-       {\r
+       public static function barre($filtres = null, $action = null, $dashboard = null, $shortcuts = null) {\r
                if (is_null($shortcuts) && is_null($filtres)) {\r
                        return '<div id="bar" class="vide"></div>';\r
                }\r
@@ -103,7 +101,7 @@ class commonPage {
                if (!is_null($filtres) && is_array($filtres)) {\r
                        $res .= '<form action="' . $action . '" method="post" class="submitonchange">';\r
                        $hasRealFilters = false;\r
-                       foreach($filtres as $filtre) {\r
+                       foreach ($filtres as $filtre) {\r
                                $res .= $filtre->display();\r
                                if ($filtre instanceof commonFiltre) {\r
                                        $hasRealFilters = true;\r
@@ -123,27 +121,27 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function shortcuts($shortcuts)\r
-       {\r
+       public static function shortcuts($shortcuts) {\r
                global $core;\r
 \r
                $res = '';\r
-               foreach($shortcuts as $s) {\r
+               foreach ($shortcuts as $s) {\r
                        $res .= '<div class="shortcut">' . $s . '</div>';\r
                }\r
                return $res;\r
        }\r
 \r
-       public static function tMain($id = null, $big = false)\r
-       {\r
-               $id = is_null($id)?'':' id="' . $id . '"';\r
-               $big = $big?' class="big"':'';\r
+       public static function tMain($id = null, $big = false) {\r
+               $id = is_null($id) ? '' : ' id="' . $id . '"';\r
+               $big = $big ? ' class="big"' : '';\r
                return '<div id="main"' . $big . '><div id="logo-main"></div><div class="content"' . $id . '>';\r
        }\r
 \r
-       public static function bh($class = null)\r
-       {\r
-               $class = is_null($class)?' class="b"':' class="b ' . $class . '"';\r
+       public static function bh($class = null) {\r
+               return '<div class="b">';\r
+               $class = is_null($class) ? ' class="b"' : ' class="b ' . $class . '"';\r
+\r
+\r
 \r
                $res = '<table' . $class . '>';\r
                $res .= '<tr class="b-top">';\r
@@ -154,8 +152,8 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function bf($max = false)\r
-       {\r
+       public static function bf($max = false) {\r
+               return '</div>';\r
                $res = '</div></td><td class="b-e"></td>';\r
                $res .= '</tr>';\r
                $res .= '<tr class="b-footer">';\r
@@ -169,8 +167,7 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function pager($current, $nb, $par_page, $url)\r
-       {\r
+       public static function pager($current, $nb, $par_page, $url) {\r
                $style = 'pgleft';\r
                if ($par_page == 0 || $nb <= $par_page) {\r
                        return;\r
@@ -195,19 +192,18 @@ class commonPage {
                return $res;\r
        }\r
 \r
-       public static function bMain()\r
-       {\r
+       public static function bMain() {\r
                return '</div></div>';\r
        }\r
 \r
-       public static function footer()\r
-       {\r
+       public static function footer() {\r
                $res = '<div id="footer"></div>';\r
                $res .= cubePage::googleAnalytics(GA);\r
                $res .= '</body>';\r
                $res .= '</html>';\r
                return $res;\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/index.php b/index.php
index d03bb060cdfb7a907d18108467386826eabd5311..5af84e767ef344cc8285d0b59da960f22c380ce1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php\r
+\r
 require_once(dirname(__FILE__) . '/inc/prepend.php');\r
 ob_start();\r
 \r
@@ -7,7 +8,10 @@ $js[] = JS_PATH . '/common.js';
 $js[] = JS_PATH . '/' . MODE . '.js';\r
 $jsvar['IMG'] = IMG;\r
 $jsvar['SITE_PATH'] = SITE_PATH;\r
+\r
+$css[] = WEBROOT . '/style/common.css';\r
 $css[] = CSS_PATH . '/style.css';\r
+\r
 $standard = 'XHTML 1.0 Transitional';\r
 \r
 echo $core->url->getDocument();\r
@@ -15,5 +19,4 @@ $buffer = ob_get_contents();
 \r
 ob_clean();\r
 echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);\r
-\r
 ?>
\ No newline at end of file

diff --git a/style/common.css b/style/common.css
new file mode 100644 (file)
index 0000000..7f6dfbd
--- /dev/null
+++ b/style/common.css
@@ -0,0 +1,24 @@
+.b{padding:3px;
+   background:#ffffff;
+   border-radius:7px;
+   -ms-box-shadow:0px 0px 5px #999fab;
+   -o-box-shadow:0px 0px 5px #999fab;
+   -moz-box-shadow:0px 0px 5px #999fab;
+   -webkit-box-shadow:0px 0px 5px #999fab;
+   box-shadow:0px 0px 5px #999fab;
+   margin-bottom: 10px;
+}
+
+/* Top left */
+.b table tr:first-child th:first-child{
+       border-radius:6px 0 0 0;
+}
+.b table tr:first-child th:last-child{
+       border-radius:0 6px 0 0;
+}
+.b table tr:last-child td:first-child{
+       border-radius:0 0 0 6px;
+}
+.b table tr:last-child td:last-child{
+       border-radius:0 0 6px 0;
+}
\ No newline at end of file

diff --git a/style/extranet/style.css b/style/extranet/style.css
index 437208de4637740475c241ff104f7a55b1c22b7c..b8155edef446c8980211ab49d1c5fc6f4ffb0956 100644 (file)
--- a/style/extranet/style.css
+++ b/style/extranet/style.css
@@ -133,28 +133,6 @@ input[type="text"],input[type="password"],select,textarea{
 }\r
 \r
 \r
-\r
-/* Cadre */\r
-.b{margin:0 auto;}\r
-.b-c{overflow:hidden;}\r
-.b-c>div{background:#fff;}\r
-.b-c>div table{width:100%;}\r
-.b-nw{background:url(b-nw.png) no-repeat transparent;}\r
-.b-n{background:url(b-n.png) repeat-x;}\r
-.b-ne{background:url(b-ne.png) no-repeat  transparent;}\r
-.b-w{background:url(b-w.png) repeat-y transparent;}\r
-.b-e{background:url(b-e.png) repeat-y top right transparent;}\r
-.b-sw{background:url(b-sw.png) no-repeat bottom left transparent;}\r
-.b-s{background:url(b-s.png) repeat-x;}\r
-.b-se{background:url(b-se.png) no-repeat transparent;}\r
-\r
-.b-nw, .b-sw, .b-w{width:12px;max-width:12px;min-width:12px;}\r
-.b-ne, .b-se, .b-e{width:11px;max-width:11px;min-width:11px;}\r
-.b-n, .b-ne, .b-nw{height:11px;max-height:11px;min-height:11px;}\r
-.b-s, .b-se, .b-sw{height:10px;max-height:10px;min-height:10px;}\r
-.b-n, .b-s{width:auto;}\r
-.b-e, .b-w{height:auto;}\r
-\r
 .popupOverlay{background:#666;opacity:0;position:fixed;display:none;top:0px;left:0px;width:100%;height:100%;}\r
 .popupWindow{display:none;opacity:1;position:fixed;}\r
 /*.popupWindow>table{width:600px;}*/\r

diff --git a/style/ws/style.css b/style/ws/style.css
index 92ea9dc4bd6677f063a9aa05551f15fabeae1b2c..8ccac008e39f012f75c77c00057d807207f7c874 100644 (file)
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -39,7 +39,6 @@ input[type="text"],input[type="password"],select,textarea{
 \r
 .content .swfPanel{height:100%;}\r
 \r
-.big .liste{width:1180px !important;}\r
 .big .liste td{font-size:11px !important;padding-left:5px;padding-right:5px;}\r
 .big .liste th{padding-left:5px;padding-right:5px;}\r
 .big .content{width:1210px;}\r
@@ -143,28 +142,6 @@ input[type="text"],input[type="password"],select,textarea{
        background-position:bottom left;\r
 }\r
 \r
-\r
-/* Cadre */\r
-.b{margin:0 auto;}\r
-.b-c{overflow:hidden;}\r
-.b-c>div{background:#fff;}\r
-.b-c>div table{width:100%;}\r
-.b-nw{background:url(b-nw.png) no-repeat transparent;}\r
-.b-n{background:url(b-n.png) repeat-x;}\r
-.b-ne{background:url(b-ne.png) no-repeat  transparent;}\r
-.b-w{background:url(b-w.png) repeat-y transparent;}\r
-.b-e{background:url(b-e.png) repeat-y top right transparent;}\r
-.b-sw{background:url(b-sw.png) no-repeat bottom left transparent;}\r
-.b-s{background:url(b-s.png) repeat-x;}\r
-.b-se{background:url(b-se.png) no-repeat transparent;}\r
-\r
-.b-nw, .b-sw, .b-w{width:12px;max-width:12px;min-width:12px;}\r
-.b-ne, .b-se, .b-e{width:11px;max-width:11px;min-width:11px;}\r
-.b-n, .b-ne, .b-nw{height:11px;max-height:11px;min-height:11px;}\r
-.b-s, .b-se, .b-sw{height:10px;max-height:10px;min-height:10px;}\r
-.b-n, .b-s{width:auto;}\r
-.b-e, .b-w{height:auto;}\r
-\r
 .popupOverlay{background:#a8aa95;opacity:0;position:fixed;display:none;top:0px;left:0px;width:100%;height:100%;}\r
 .popupWindow{display:none;opacity:1;position:fixed;}\r
 /*.popupWindow>table{width:600px;}*/\r
@@ -512,6 +489,4 @@ th.stats_col{
 \r
 .downbookContextMenu a{\r
        text-decoration:none;\r
-}\r
-\r
-\r
+}
\ No newline at end of file