From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 10 Aug 2011 12:37:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=098469c95a315ca90f6c183f56a02dbacb6bf38a;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 41000c8db..dbf69bfa5 100644
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -1,7 +1,8 @@
 <?php
+
 class commonPage {
-	public static function header($args)
-	{
+
+	public static function header($args) {
 		global $js;
 		global $core;
 		// Entête HTML
@@ -21,7 +22,7 @@ class commonPage {
 		if ($core->user) {
 			$search = self::search($args);
 
-			$class = $search?' class="with-search"':'';
+			$class = $search ? ' class="with-search"' : '';
 			// Le message personnalisé avec un lien pour se déconnecter
 			$res .= '<div id="welcome"' . $class . '>' . __('Bienvenue') . ' ' . $core->user->prenom . ' ' . $core->user->nom . ' ';
 			$res .= '| <a href="#" class="popup" rel="mesParametres">' . __('Mes paramètres') . '</a> ';
@@ -39,8 +40,7 @@ class commonPage {
 		return $res;
 	}
 
-	public static function search($args)
-	{
+	public static function search($args) {
 		global $core;
 
 		if (!commonDroits::recherche($args[0])) {
@@ -50,7 +50,7 @@ class commonPage {
 		$settings = $core->user->getSettings($args[0]);
 		$action = 'search' . ucfirst($args[0]);
 
-		$default = isset($_POST['q'])?$_POST['q']:__('Rechercher');
+		$default = isset($_POST['q']) ? $_POST['q'] : __('Rechercher');
 		// Formulaire de recherche
 		$res = '<form action="' . $action . '" method="post">';
 		$res .= '<div id="search">' . form::field('q', 20, 128, $default, 'empty_field') . '<a href="#" class="submit">' . cubeMedia::spacer(22, 22) . '</a></div>';
@@ -58,8 +58,7 @@ class commonPage {
 		return $res;
 	}
 
-	public static function nav($args)
-	{
+	public static function nav($args) {
 		// Barre d'onglets
 		global $core;
 		// Liste des onglets
@@ -78,17 +77,16 @@ class commonPage {
 		$supp = array('stats' => 'publications');
 
 		$res = '<div id="nav">';
-		foreach($onglets as $titre => $url) {
+		foreach ($onglets as $titre => $url) {
 			// Si cet onglet correspond à la page active, on le place actif
-			$active = ($args[0] == $url || (isset($supp[$args[0]]) && $supp[$args[0]] == $url))?' class="active"':'';
+			$active = ($args[0] == $url || (isset($supp[$args[0]]) && $supp[$args[0]] == $url)) ? ' class="active"' : '';
 			$res .= '<a href="' . SITE_PATH . $url . '"' . $active . '>' . cubeMedia::cssRollover($core->typo->Onglet($titre, '', false)) . '</a>';
 		}
 		$res .= '</div>';
 		return $res;
 	}
 
-	public static function barre($filtres = null, $action = null, $dashboard = null, $shortcuts = null)
-	{
+	public static function barre($filtres = null, $action = null, $dashboard = null, $shortcuts = null) {
 		if (is_null($shortcuts) && is_null($filtres)) {
 			return '<div id="bar" class="vide"></div>';
 		}
@@ -103,7 +101,7 @@ class commonPage {
 		if (!is_null($filtres) && is_array($filtres)) {
 			$res .= '<form action="' . $action . '" method="post" class="submitonchange">';
 			$hasRealFilters = false;
-			foreach($filtres as $filtre) {
+			foreach ($filtres as $filtre) {
 				$res .= $filtre->display();
 				if ($filtre instanceof commonFiltre) {
 					$hasRealFilters = true;
@@ -123,27 +121,27 @@ class commonPage {
 		return $res;
 	}
 
-	public static function shortcuts($shortcuts)
-	{
+	public static function shortcuts($shortcuts) {
 		global $core;
 
 		$res = '';
-		foreach($shortcuts as $s) {
+		foreach ($shortcuts as $s) {
 			$res .= '<div class="shortcut">' . $s . '</div>';
 		}
 		return $res;
 	}
 
-	public static function tMain($id = null, $big = false)
-	{
-		$id = is_null($id)?'':' id="' . $id . '"';
-		$big = $big?' class="big"':'';
+	public static function tMain($id = null, $big = false) {
+		$id = is_null($id) ? '' : ' id="' . $id . '"';
+		$big = $big ? ' class="big"' : '';
 		return '<div id="main"' . $big . '><div id="logo-main"></div><div class="content"' . $id . '>';
 	}
 
-	public static function bh($class = null)
-	{
-		$class = is_null($class)?' class="b"':' class="b ' . $class . '"';
+	public static function bh($class = null) {
+		return '<div class="b">';
+		$class = is_null($class) ? ' class="b"' : ' class="b ' . $class . '"';
+
+
 
 		$res = '<table' . $class . '>';
 		$res .= '<tr class="b-top">';
@@ -154,8 +152,8 @@ class commonPage {
 		return $res;
 	}
 
-	public static function bf($max = false)
-	{
+	public static function bf($max = false) {
+		return '</div>';
 		$res = '</div></td><td class="b-e"></td>';
 		$res .= '</tr>';
 		$res .= '<tr class="b-footer">';
@@ -169,8 +167,7 @@ class commonPage {
 		return $res;
 	}
 
-	public static function pager($current, $nb, $par_page, $url)
-	{
+	public static function pager($current, $nb, $par_page, $url) {
 		$style = 'pgleft';
 		if ($par_page == 0 || $nb <= $par_page) {
 			return;
@@ -195,19 +192,18 @@ class commonPage {
 		return $res;
 	}
 
-	public static function bMain()
-	{
+	public static function bMain() {
 		return '</div></div>';
 	}
 
-	public static function footer()
-	{
+	public static function footer() {
 		$res = '<div id="footer"></div>';
 		$res .= cubePage::googleAnalytics(GA);
 		$res .= '</body>';
 		$res .= '</html>';
 		return $res;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index d03bb060c..5af84e767 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once(dirname(__FILE__) . '/inc/prepend.php');
 ob_start();
 
@@ -7,7 +8,10 @@ $js[] = JS_PATH . '/common.js';
 $js[] = JS_PATH . '/' . MODE . '.js';
 $jsvar['IMG'] = IMG;
 $jsvar['SITE_PATH'] = SITE_PATH;
+
+$css[] = WEBROOT . '/style/common.css';
 $css[] = CSS_PATH . '/style.css';
+
 $standard = 'XHTML 1.0 Transitional';
 
 echo $core->url->getDocument();
@@ -15,5 +19,4 @@ $buffer = ob_get_contents();
 
 ob_clean();
 echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);
-
 ?>
\ No newline at end of file
diff --git a/style/common.css b/style/common.css
new file mode 100644
index 000000000..7f6dfbda9
--- /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 437208de4..b8155edef 100644
--- a/style/extranet/style.css
+++ b/style/extranet/style.css
@@ -133,28 +133,6 @@ input[type="text"],input[type="password"],select,textarea{
 }
 
 
-
-/* Cadre */
-.b{margin:0 auto;}
-.b-c{overflow:hidden;}
-.b-c>div{background:#fff;}
-.b-c>div table{width:100%;}
-.b-nw{background:url(b-nw.png) no-repeat transparent;}
-.b-n{background:url(b-n.png) repeat-x;}
-.b-ne{background:url(b-ne.png) no-repeat  transparent;}
-.b-w{background:url(b-w.png) repeat-y transparent;}
-.b-e{background:url(b-e.png) repeat-y top right transparent;}
-.b-sw{background:url(b-sw.png) no-repeat bottom left transparent;}
-.b-s{background:url(b-s.png) repeat-x;}
-.b-se{background:url(b-se.png) no-repeat transparent;}
-
-.b-nw, .b-sw, .b-w{width:12px;max-width:12px;min-width:12px;}
-.b-ne, .b-se, .b-e{width:11px;max-width:11px;min-width:11px;}
-.b-n, .b-ne, .b-nw{height:11px;max-height:11px;min-height:11px;}
-.b-s, .b-se, .b-sw{height:10px;max-height:10px;min-height:10px;}
-.b-n, .b-s{width:auto;}
-.b-e, .b-w{height:auto;}
-
 .popupOverlay{background:#666;opacity:0;position:fixed;display:none;top:0px;left:0px;width:100%;height:100%;}
 .popupWindow{display:none;opacity:1;position:fixed;}
 /*.popupWindow>table{width:600px;}*/
diff --git a/style/ws/style.css b/style/ws/style.css
index 92ea9dc4b..8ccac008e 100644
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -39,7 +39,6 @@ input[type="text"],input[type="password"],select,textarea{
 
 .content .swfPanel{height:100%;}
 
-.big .liste{width:1180px !important;}
 .big .liste td{font-size:11px !important;padding-left:5px;padding-right:5px;}
 .big .liste th{padding-left:5px;padding-right:5px;}
 .big .content{width:1210px;}
@@ -143,28 +142,6 @@ input[type="text"],input[type="password"],select,textarea{
 	background-position:bottom left;
 }
 
-
-/* Cadre */
-.b{margin:0 auto;}
-.b-c{overflow:hidden;}
-.b-c>div{background:#fff;}
-.b-c>div table{width:100%;}
-.b-nw{background:url(b-nw.png) no-repeat transparent;}
-.b-n{background:url(b-n.png) repeat-x;}
-.b-ne{background:url(b-ne.png) no-repeat  transparent;}
-.b-w{background:url(b-w.png) repeat-y transparent;}
-.b-e{background:url(b-e.png) repeat-y top right transparent;}
-.b-sw{background:url(b-sw.png) no-repeat bottom left transparent;}
-.b-s{background:url(b-s.png) repeat-x;}
-.b-se{background:url(b-se.png) no-repeat transparent;}
-
-.b-nw, .b-sw, .b-w{width:12px;max-width:12px;min-width:12px;}
-.b-ne, .b-se, .b-e{width:11px;max-width:11px;min-width:11px;}
-.b-n, .b-ne, .b-nw{height:11px;max-height:11px;min-height:11px;}
-.b-s, .b-se, .b-sw{height:10px;max-height:10px;min-height:10px;}
-.b-n, .b-s{width:auto;}
-.b-e, .b-w{height:auto;}
-
 .popupOverlay{background:#a8aa95;opacity:0;position:fixed;display:none;top:0px;left:0px;width:100%;height:100%;}
 .popupWindow{display:none;opacity:1;position:fixed;}
 /*.popupWindow>table{width:600px;}*/
@@ -512,6 +489,4 @@ th.stats_col{
 
 .downbookContextMenu a{
 	text-decoration:none;
-}
-
-
+}
\ No newline at end of file