Menu
▾
▴
oscss-commit — SVN Commit Notifications
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(57) |
May
(31) |
Jun
(21) |
Jul
(11) |
Aug
(23) |
Sep
(22) |
Oct
(36) |
Nov
(62) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(24) |
Feb
(24) |
Mar
(65) |
Apr
(232) |
May
(118) |
Jun
(22) |
Jul
(54) |
Aug
(57) |
Sep
(14) |
Oct
(27) |
Nov
(16) |
Dec
(19) |
| 2013 |
Jan
(16) |
Feb
(12) |
Mar
(3) |
Apr
(17) |
May
(2) |
Jun
(30) |
Jul
(33) |
Aug
(19) |
Sep
(35) |
Oct
(58) |
Nov
(27) |
Dec
(64) |
| 2014 |
Jan
(102) |
Feb
(80) |
Mar
(15) |
Apr
(4) |
May
(3) |
Jun
(3) |
Jul
(5) |
Aug
(11) |
Sep
(15) |
Oct
|
Nov
(3) |
Dec
(5) |
| 2015 |
Jan
(5) |
Feb
(4) |
Mar
(2) |
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
(10) |
Dec
|
| 2016 |
Jan
(3) |
Feb
(2) |
Mar
(18) |
Apr
(13) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2012-08-09 19:20:05
|
Revision: 4570
http://oscss.svn.sourceforge.net/oscss/?rev=4570&view=rev
Author: oscim
Date: 2012-08-09 19:19:58 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
suite correction css
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
Modified: branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab 2012-08-09 18:22:08 UTC (rev 4569)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab 2012-08-09 19:19:58 UTC (rev 4570)
@@ -19,8 +19,8 @@
}
?>
<fieldset>
- <legend><?php echo __('@filters filter legend choose categorie'); ?></legend>
- <ul >
+ <legend class="Ctrtirroir"><?php echo __('@filters filter legend choose categorie'); ?></legend>
+ <ul class="tirroir">
<?php foreach(categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$languages_id , 'exclude'=>array('0'))) as $k=>$item): ?>
<li class="<?php echo ((bool)(count($_SESSION['filters']['categorie']) <=0 || (string)$_SESSION['filters']['categorie'][$item['id']] == 'on')? 'select' : '' ) ?>">
<?php echo tep_draw_checkbox_field('filters[categorie]['.$item['id'].']', 'filters[categorie]['.$item['id'].']', 'on', (bool)(count($_SESSION['filters']['categorie']) <=0 || (string)$_SESSION['filters']['categorie'][$item['id']] == 'on')); ?>
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-09 18:22:08 UTC (rev 4569)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-09 19:19:58 UTC (rev 4570)
@@ -807,7 +807,7 @@
/**
- TODO a voir
+ TODO a voir
*/
osCSS_Cache::clear('also_purchased');
osCSS_Cache::clear('product');
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2012-08-09 18:22:08 UTC (rev 4569)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2012-08-09 19:19:58 UTC (rev 4570)
@@ -113,6 +113,42 @@
.tabs_lang{width:98.5%; float:left;}
}
+
+
+
+
+ fieldset {
+ margin: 0.3em ;
+ padding:0.3em;
+ border:none;
+
+ p {
+ margin: 0.3em;
+ padding:0.3em;
+ }
+
+ select,
+ input[type="text"] { min-width:62%; display:inline-block;}
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
.block_field {
text-shadow:0 1px 0 #fff;
width:98.9%; margin:2px ;
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-09 18:22:08 UTC (rev 4569)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-09 19:19:58 UTC (rev 4570)
@@ -534,6 +534,8 @@
* class qui rend element enfant visible au survol de l'element parent
*/
.view.fils {display:none}
+ .view.fils.fleft {float:right;}
+ .view.fils.fright {float:left;}
.dataTableBase tr:hover .view.fils,
.dataTable tr:hover .view.fils,
.dataTableRow.Selected .view.fils,
@@ -594,37 +596,6 @@
/**
* Forms
*/
- fieldset {
- margin: 0.3em ;
- padding:0.3em;
- border:none;
-
- p {
- margin: 0.3em;
- padding:0.3em;
- }
-
- select,
- input[type="text"] { min-width:62%; display:inline-block;}
-
- select option {display:block; float:none;clear:both;width:100%}
-
- label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
-
- ul{
- list-style:none;
- .rounded(5px);
- }
- // Cat list lors edition article ou cms
- ul.LinkToView{
- overflow: auto;
- max-height: 160px;
- background-color: #fff;
- padding: 5px;
- line-height: 15px;
- border: 1px solid #666;
- }
- }
input.radioInput {width:30px;}
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-09 18:22:08 UTC (rev 4569)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-09 19:19:58 UTC (rev 4570)
@@ -135,6 +135,12 @@
background:transparent url("../../../../../images/icons/icon_down.gif") left top no-repeat;
padding-left:(@padding_base * 2);
height:@lineheight;
+ cursor : pointer;
+
+ &:hover{
+ color:#A0A0A0;
+ opacity : 0.6;
+ }
}
.Ctrtirroir.closed {background:transparent url("../../../../../images/icons/icon_arrow_right.gif") left top no-repeat; }
fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
@@ -271,7 +277,7 @@
float:right;
}
- h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ h4{clear:both;float:left;font-weight:bold; padding:3px 5px 8px 25px; }
}
}
@@ -529,6 +535,8 @@
* class qui rend element enfant visible au survol de l'element parent
*/
.view.fils {display:none}
+ .view.fils.fleft {float:right;}
+ .view.fils.fright {float:left;}
.dataTableBase tr:hover .view.fils,
.dataTable tr:hover .view.fils,
.dataTableRow.Selected .view.fils,
@@ -589,37 +597,7 @@
/**
* Forms
*/
- fieldset {
- margin: 0.3em ;
- padding:0.3em;
- border:none;
-
- p {
- margin: 0.3em;
- padding:0.3em;
- }
-
- select,
- input[type="text"] { min-width:62%; display:inline-block;}
-
- select option {display:block; float:none;clear:both;width:100%}
-
- label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
-
- ul{
- list-style:none;
- .rounded(5px);
- }
- // Cat list lors edition article ou cms
- ul.LinkToView{
- overflow: auto;
- max-height: 160px;
- background-color: #fff;
- padding: 5px;
- line-height: 15px;
- border: 1px solid #666;
- }
- }
+
input.radioInput {width:30px;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-09 18:22:16
|
Revision: 4569
http://oscss.svn.sourceforge.net/oscss/?rev=4569&view=rev
Author: oscim
Date: 2012-08-09 18:22:08 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
suite gros travail de nettoyage et refonte des template du BO
Implementation d'une couche javascript pour traiter l'affichage des notifications de messageStack a travers des popup js avec timeout afin de ne pas polluer l'affichage
report de certaine notification manquante
FIX coquille dans formUtility
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/application_bottom.php
branches/2.1.1/catalog/admin/includes/classes/osCSS_messageStack.php
branches/2.1.1/catalog/admin/includes/classes/tableBlock.php
branches/2.1.1/catalog/admin/includes/header.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/customers.js.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/fr_FR.php
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
branches/2.1.1/catalog/admin/includes/modules/pages/categories.php
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/inc/lib_general-1.js
branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/inc/lib_general-1.js
branches/2.1.1/catalog/common/classes/formUtility.php
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/javascript/oscss.js
Modified: branches/2.1.1/catalog/admin/includes/application_bottom.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -53,9 +53,56 @@
//! close Handler
osC_ErrorHandler::stop();
}
+
+
?>
+<?php
+/**
+ Replace messageStack display generated php by javascript notification
+*/
+?>
+<script type="text/javascript">
+ $(function() {
+ <?php
+ if ($messageStack->size > 0) :
+
+ // Get errors
+ $arr = $messageStack->get_errors() ;
+
+ // adjust duration
+ $duration=array(
+ 'messageStackSuccess'=>1,
+ 'messageStackError'=>5,
+ 'messageStackWarning'=>3.5,
+ 'messageStackInfo'=>2
+ );
+
+ foreach($arr as $k=>$row): ?>
+
+ // Add message line
+ OSCSS_JSNOTIF.utils.notif.AddNotif({
+ indice:"<?php echo time() ?>",
+ style:"<?php echo $row['class'] ?>",
+ message:"<?php echo addslashes($row['text']) ?>",
+ // position:"top",
+ duration:1500 * <?php echo $duration[$row['class']]; ?>
+ });
+ <?php
+ endforeach; ?>
+
+ /// Active Display message
+ OSCSS_JSNOTIF.utils.notif.ViewNotif();
+
+ <?php
+ $messageStack->reset() ;
+ endif; ?>
+
+ });
+</script>
+
+
<?php
/**
@brief javascript for all page, post_load_value, is a function call after load page
@@ -67,6 +114,8 @@
/** Init page event js */
function post_load_page(){
+
+
$('form.fancy,form.fancyView').ajaxForm({
success: function(responseText){
$.fancybox({'content':responseText});
@@ -168,6 +217,8 @@
// Call Back Exec
<?php echo oscss_cstr::CallBackExec(); ?>
+
+
}
// --></script>
@@ -175,7 +226,7 @@
<script type="text/javascript"><!--
/** Init page event js */
- post_load_page()
+ post_load_page();
// --></script>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: branches/2.1.1/catalog/admin/includes/classes/osCSS_messageStack.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/osCSS_messageStack.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/classes/osCSS_messageStack.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -1,9 +1,9 @@
<?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
+ @version 2.1.1
@date 09/11/10, 09:08
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
@@ -16,7 +16,7 @@
*/
class messageStack extends tableBlock {
- var $size = 0;
+ public $size = 0;
protected static $_instance;
@@ -28,7 +28,7 @@
if (tep_session_is_registered('messageToStack')) {
for ($i = 0, $n = sizeof($messageToStack); $i < $n; $i++) {
- $this->add($messageToStack[$i]['text'], $messageToStack[$i]['type']);
+ $this->add($messageToStack[$i]['text'], $messageToStack[$i]['type']);
}
tep_session_unregister('messageToStack');
}
@@ -45,17 +45,23 @@
}
public function add($message, $type = 'error') {
- if ($type == 'error') {
- $this->errors[] = array('class' => 'messageStackError', 'text' => $message);
- } elseif ($type == 'warning') {
- $this->errors[] = array('class' => 'messageStackWarning', 'text' => $message);
- } elseif ($type == 'success') {
- $this->errors[] = array('class' => 'messageStackSuccess', 'text' => $message);
- } else {
- $this->errors[] = array('class' => 'messageStackError', 'text' => $message);
- }
+ static $nobl;
+ if(!is_array($nobl)) $nobl = array();
- $this->size++;
+ if(!isset($nobl[md5($message)])){
+ if ($type == 'error') {
+ $this->errors[] = array('class' => 'messageStackError', 'text' => $message);
+ } elseif ($type == 'warning') {
+ $this->errors[] = array('class' => 'messageStackWarning', 'text' => $message);
+ } elseif ($type == 'success') {
+ $this->errors[] = array('class' => 'messageStackSuccess', 'text' => $message);
+ } else {
+ $this->errors[] = array('class' => 'messageStackInfo', 'text' => $message);
+ }
+
+ $nobl[md5($message)] = '';
+ $this->size++;
+ }
}
public function add_session($message, $type = 'error') {
@@ -88,11 +94,11 @@
Alias
*/
public function get_errors(){
- return $this->output();
+ return $this->errors;
}
public function output() {
- $this->table_data_parameters = 'class="messageBox"';
+// $this->table_data_parameters = 'class="messageBox"';
return $this->tableBlock($this->errors);
}
}
Modified: branches/2.1.1/catalog/admin/includes/classes/tableBlock.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/tableBlock.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/classes/tableBlock.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -3,7 +3,7 @@
@licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
+ @version 2.1.1
@date 10/06/10, 09:08
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
ayatus - oscim - oscssTeam
Modified: branches/2.1.1/catalog/admin/includes/header.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/header.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/header.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -20,9 +20,13 @@
tep_include_file (DIR_WS_JS."jquery.fancybox/jquery.fancybox.css",true);
if( ($css=tep_test_gab_ele("jquery-ui",'css')) !=false ) tep_include_file ($css,true);
-
+ // lasted
tep_include_file (DIR_WS_JS."jquery.min.js",true);
+ // specifique lib for core osCSS
+ tep_include_file (DIR_WS_JS."oscss.js",true);
+
+ // ui plugin jquery
tep_include_file ("includes/javascript/jquery-ui.min.js",true);
tep_include_file ("includes/javascript/jquery.cookie.js",true);
if ( ($lng=language::LangueSelected()) && $lng != 'en') tep_include_file ("includes/javascript/jquery-ui-i18n.min.js",true);
@@ -38,33 +42,17 @@
tep_include_file (DIR_WS_JS."dataTables.TableTools/js/TableTools.min.js",true);
}
?>
-<script type="text/javascript"><!--
-
-
-
- // init jquery
+<?php
+/**
+ Section for use , and all manipluate listing by plugi jquery dataTable
+*/
+?>
+<script type="text/javascript"><!--
+// init jquery
$(function() {
-// var anchor = jQuery.url.attr('anchor');
-//
-// alert(anchor);
-
- //! slider block tirroir
- $('.Ctrtirroir').each(function(){
- $(this).click(function () {
- $(this).next().slideToggle('slow');
- $(this).toggleClass("closed");
- });
- //load force close
- $(this).next().slideToggle('slow');
- $(this).toggleClass("closed");
- });
-
-
-
-
// Tri de tableau
<?php if(defined('JSONSTATMENT')) : ?>
var asInitVals = new Array();
Modified: branches/2.1.1/catalog/admin/includes/javascript/modules/pages/customers.js.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/modules/pages/customers.js.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/javascript/modules/pages/customers.js.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -55,7 +55,7 @@
if (customers_telephone == "" || customers_telephone.length < <?php echo ENTRY_TELEPHONE_MIN_LENGTH; ?>) {
- error_message = error_message + "<?php echo addslashes(JS_TELEPHONE); ?>";
+ error_message = error_message + "<?php echo sprintf(addslashes(__('js tel lenght')), ENTRY_EMAIL_ADDRESS_MIN_LENGTH); ?>";
error = 1;
}
Added: branches/2.1.1/catalog/admin/includes/javascript/oscss.js
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/oscss.js (rev 0)
+++ branches/2.1.1/catalog/admin/includes/javascript/oscss.js 2012-08-09 18:22:08 UTC (rev 4569)
@@ -0,0 +1,135 @@
+
+/**
+ * osCSS Notification replace display code php by javascript and no intrusive code
+ *
+ * Use
+ * Add line in instance
+ * OSCSS_JSNOTIF.utils.notif.AddNotif({indice : 1 ,style: 'toto' , message:"test 1"})
+ *
+ * Draw all message
+ *
+ * OSCSS_JSNOTIF.utils.notif.ViewNotif();
+ */
+
+OSCSS_JSNOTIF = {};
+
+(function(){ // début de scope local
+OSCSS_JSNOTIF.utils = OSCSS_JSNOTIF.utils || {};
+
+// déclaration de la classe de validation proprement dite
+OSCSS_JSNOTIF.utils.notif = {
+ // déclaration de nos variables statiques
+ settings : {
+ style:"",
+ message:"",
+ position:"bottom",
+ speed:500,
+ duration:1500
+ },
+
+ notification : {},
+
+ size :0,
+
+ Clean:function(){
+ self.size = 0;
+ self.notification = {};
+ },
+
+
+ // déclaration de nos méthodes
+ AddNotif:function( opts ) {
+
+ var opt = $.extend(self.settings,opts);
+
+ var name = 'messid_' + self.size;
+
+ self.notification[self.size++] = $.extend(opts, self.settings);
+ },
+
+ // Display all message and hide display by php
+ ViewNotif:function( opts ){
+
+ // on vérifie si il y'a déjà une div de notification
+ if($("#messageStack").length == 0){
+ //il n'y en a pas, on jQuery créé la barre de notification
+ $("body").append('<div id="messageStack"></div>');
+ }
+
+
+ /* Petite bonne pratique, stocker vos appel jQuery dans une variable
+ *pour faciliter le code et améliorer les performances de vos scripts */
+ var $pile = $("#messageStack");
+
+
+ /**
+ * Loop for add message in DOM
+ */
+ for (var nom_indice in self.notification){
+
+ // put in html modele
+ var e = $('<p id="messid' + self.notification[nom_indice].indice + '" class="' + self.notification[nom_indice].style + ' item">' + self.notification[nom_indice].message +'<span class="ButtonClose">Close</span></p>');
+
+ // add in master html block
+ $pile
+ .append(e);
+
+ // tout est prêt, on anime la notification
+ $("#messid" + self.notification[nom_indice].indice )
+ .fadeIn(self.notification[nom_indice].speed)
+ // on fait patienter jQuery
+ .delay(self.notification[nom_indice].duration)
+ // et on masque la notification
+ .fadeOut(self.notification[nom_indice].speed);
+ }
+
+
+ // on gere le bouton close des popup d'alert
+ $('.ButtonClose').each(function(){
+ $(this).click(function () {
+ $(this).parent().hide();
+ });
+ });
+
+ // Hide html dipslay block write by php
+ if($(".messageStack").length > 0){
+ //on cache le retour php
+ $(".messageStack").hide();
+ }
+
+ // suppression de la pile
+ self.Clean();
+
+ }
+
+};
+// fin de classe
+
+// trick JavaScript pour émuler le self:: en PHP : on utilise une variable locale
+var self = OSCSS_JSNOTIF.utils.notif;
+})(); // fin de scope local
+
+
+
+
+
+
+
+
+
+
+// init jquery
+$(function() {
+
+ //! slider block tirroir
+ $('.Ctrtirroir').each(function(){
+ $(this).click(function () {
+ $(this).next().slideToggle('slow');
+ $(this).toggleClass("closed");
+ });
+ //load force close
+ $(this).next().slideToggle('slow');
+ $(this).toggleClass("closed");
+ });
+
+});
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/fr_FR.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/fr_FR.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/fr_FR.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -130,7 +130,6 @@
// javascript messages
define('JS_STATE',"* L'entrée 'Etat' doit avoir été choisie.\n" );
define('JS_STATE_SELECT',"-- Choisissez ci-dessus --" );
-define('JS_TELEPHONE',"* L'entrée 'Numéro de téléphone' doit avoir au moins " . ENTRY_TELEPHONE_MIN_LENGTH . " caractères.\n" );
define('ENTRY_EMAIL_ADDRESS',"Adresse électronique :" );
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-08-09 18:22:08 UTC (rev 4569)
@@ -136,6 +136,9 @@
$lang['action delete for %s ok']="Erreur lors de la suppresion du client %s" ;
$lang['error delete for %s']="Suppression du client %s effectué" ;
+ /* MessageStack */
+ $lang['@customers update confirm status customers']="Mise à jour de l'état de 'confirmé' " ;
+ $lang['@customers update status customers']="Mise à jour de l'état " ;
@@ -147,9 +150,11 @@
$lang['js email_address']="* L'entrée 'Adresse électronique' doit avoir au moins %s caractères." ;
$lang['js address']="* L'entrée 'Adresse' doit avoir au moins %s caractères." ;
$lang['js city']="* L'entrée 'Ville' doit avoir au moins %s caractères." ;
+ $lang['js tel lenght %s']="* L'entrée 'Numéro de téléphone' doit avoir au moins %s caractères." ;
+
/* Email subject */
$lang['subject copy creat new compte for customers']="Copie - creation de compte client par un admin" ;
$lang['creat new compte for customers']="Confirmation de votre inscription" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/products.txt 2012-08-09 18:22:08 UTC (rev 4569)
@@ -156,6 +156,13 @@
$lang['text legend image']="Image" ;
+ /* MessageStack */
+ $lang['@product error in update process']="Erreur lors de l'enregsitrement du produit" ;
+ $lang['@product success in update process']="Mise à jour reussie" ;
+ $lang['@product update status product']="Changement de l'etat du produit" ;
+ $lang['@product delete product']="Suppression du produit" ;
+ $lang['@product success in update process']="Mise à jour reussie" ;
+
/* js alert */
$lang['js alert products name']="Le nom du produit est obligatoire" ;
@@ -168,8 +175,9 @@
$lang['text info copy to intro']="Veuillez choisir une nouvelle catégorie dans laquelle vous souhaitez copier ce produit" ;
$lang['text info heading copy to']="Copier vers" ;
- $lang['create products in new link categorie for %s']="Copie réussie du produit" ;
- $lang['error for create products in new link categorie for %s']="Erreur lors de la copie du produit" ;
+ /* MessageStack */
+ $lang['@product create products in new link categorie for %s']="Copie réussie du produit" ;
+ $lang['@product error for create products in new link categorie for %s']="Erreur lors de la copie du produit" ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/categories.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/categories.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/categories.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -211,17 +211,22 @@
$res = sqlcategorie::create($params);
+ $function = (isset($_POST['origin'])? 'add_session' : 'add' );
+
if( ! $res )
- $messageStack->add_session(sprintf(__('error save categorie : %s'), sqlcategorie::$error ), 'error');
+ $messageStack->$function(sprintf(__('error save categorie : %s'), sqlcategorie::$error ), 'error');
else
- $messageStack->add_session(sprintf(__('save categorie %s success'), $res ), 'success');
+ $messageStack->$function(sprintf(__('save categorie %s success'), $res ), 'success');
osCSS_Cache::clear('categorie');
if(isset($_POST['up_and_close']) )
- if(isset($_POST['origin']) ) tep_redirect(tep_href_link($_POST['origin']));
- else tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . self::$cPath . ''));
+ // by popup ajax
+ if(isset($_POST['origin']) )
+ tep_redirect(tep_href_link($_POST['origin']));
+ else
+ tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . self::$cPath . ''));
else
tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . self::$cPath . '&cID=' . $res.'&action=edit'));
break;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -439,8 +439,12 @@
$DB->query("update " . TABLE_CUSTOMERS . " set customers_status = '" .(int) $_GET['flag'] . "' where customers_id = '" . (int)$newsletter_id . "'");
}
- if(!isset($_GET['forceajax']))
+ if(!isset($_GET['forceajax'])){
+ $messageStack->add_session(__('@customers update status customers'), 'success');
tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
+ }
+ else
+ $messageStack->add(__('@customers update status customers'), 'success');
break;
case 'setflagda':
@@ -451,8 +455,12 @@
$DB->query("update " . TABLE_CUSTOMERS . " set customers_group_ra = '" .(int) $_GET['flag'] . "' where customers_id = '" . (int)$newsletter_id . "'");
}
- if(!isset($_GET['forceajax']))
+ if(!isset($_GET['forceajax'])){
+ $messageStack->add_session(__('@customers update confirm status customers'), 'success');
tep_redirect(tep_href_link(self::FILENAME, 'cID=' . $_GET['cID']));
+ }
+ else
+ $messageStack->add(__('@customers update confirm status customers'), 'success');
break;
@@ -504,7 +512,7 @@
throw new Exception(__("Le nombre de caractéres ne suffit pour le nom, min:").ENTRY_LAST_NAME_MIN_LENGTH);
if (_cst_bool('ACCOUNT_DOB'))
if (!checkdate(substr(tep_date_raw($testobj->customers_dob), 5, 2), substr(tep_date_raw($testobj->customers_dob), 8, 2), substr(tep_date_raw($testobj->customers_dob), 0, 4)))
- throw new Exception(__("Le format de la date de naissance n'est pas correct"));
+ throw new Exception(__("Le format de la date de naissance n'est pas correct"));
if (strlen($testobj->customers_email_address) < ENTRY_EMAIL_ADDRESS_MIN_LENGTH) throw new Exception(__("L'adresse email est trop courte, min:").ENTRY_EMAIL_ADDRESS_MIN_LENGTH);
if (!self::tep_validate_email($testobj->customers_email_address))throw new Exception(ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -712,8 +712,13 @@
osCSS_Cache::clear('product');
}
- if(!isset($_GET['forceajax']))
+ if(!isset($_GET['forceajax'])){
+ $messageStack->add_session(__('@product update status product'), 'success');
tep_redirect(tep_href_link(self::FILENAME, tep_get_all_get_params(array('action','cPath','pID','setflag','flag'), false) ));
+ }
+ else
+ $messageStack->add(__('@product update status product'), 'success');
+
break;
@@ -732,9 +737,11 @@
$product_categories = (array)@$_POST['product_categories'];
sqlproduct::delete(array('id'=>$product_id, 'catarray'=>$product_categories ) );
+
+ $messageStack->add_session(__('@product delete product'), 'success');
}
- osCSS_Cache::clear('product');
+ osCSS_Cache::clear('product');
tep_redirect(tep_href_link(self::FILENAME));
break;
@@ -793,10 +800,19 @@
$params['language_id']= $languages_id;
- sqlproduct::update( $params );
+ if( ! sqlproduct::update( $params ) )
+ $messageStack->add_session(__('@product error in update process'), 'error');
+ else
+ $messageStack->add_session(__('@product success in update process'), 'success');
+
+/**
+ TODO a voir
+*/
osCSS_Cache::clear('also_purchased');
+ osCSS_Cache::clear('product');
+
if(isset($_POST['up_and_close']) ) tep_redirect(tep_href_link(self::FILENAME, 'pID=' . $products_id));
else tep_redirect(tep_href_link(self::FILENAME, 'pID=' . $products_id.'&action=edit' ));
@@ -812,10 +828,10 @@
if( ($pid = sqlproduct::copyto(array('id'=>$products_id ,'catid'=>$categories_id ,'type'=>$type))) && $pid > 0 ){
$products_id = $pid;
- $messageStack->add_session(sprintf(__('create products in new link categorie for %s'), $type ), 'success');
+ $messageStack->add_session(sprintf(__('@product create products in new link categorie for %s'), $type ), 'success');
}
else
- $messageStack->add_session(sprintf(__('error for create products in new link categorie for %s'), $type ), 'error');
+ $messageStack->add_session(sprintf(__('@product error for create products in new link categorie for %s'), $type ), 'error');
osCSS_Cache::clear('product');
@@ -837,7 +853,6 @@
case 'edit':
- // case 'new_product':
self::$Info = new objectInfo(sqlproduct::Specimen());
@@ -864,15 +879,13 @@
break;
default:
-
- //! Entretient liens avec categorie
- sqlproduct::Maintenance();
-
-
+ //! Entretient liens avec categorie
+ sqlproduct::Maintenance();
}
- } else {
+ }
+ else {
/**
@remarks A module has asked to privately take care of this action, check if class and method exist and run it.
*/
@@ -904,11 +917,6 @@
/**
- @fn load_db_values($ID)
- */
-// public static function load_db_values($ID){
-
- /**
@fn featured::GetDBValue();
@brief return DB value adapted for current action
Use self::action for determine switch
@@ -919,7 +927,7 @@
$action=self::$action;
-// var_dump($action);
+
switch ($action) {
case 'detail':
case 'new':
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less 2012-08-09 18:22:08 UTC (rev 4569)
@@ -99,6 +99,7 @@
.sub{
&:after{ content: " >>"; }
}
+
.ssmenu{
position:absolute;
top:-1px;
@@ -130,12 +131,17 @@
li{
float:none;
width:200px;
+
+ &:hover ul { display:block; }
}
}
}
.ssmenu li:hover ul.ssmenu,
.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+
+ .ssmenu li ul.ssmenu,
+ .ssmenu li ul.ssmenu li ul.ssmenu{ display:none; }
}
ul{
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-09 18:22:08 UTC (rev 4569)
@@ -8,7 +8,9 @@
* @encode UTF-8
*/
-/* Mixin */
+/**
+ * Mixin
+ */
.wrap () {
text-wrap: wrap;
@@ -18,7 +20,7 @@
}
/**
- * Reto-compatibilte oscommerce oscss < 2.xx
+ * Retro-compatibilte oscommerce oscss < 2.xx
*/
/* info box block droit */
.infoBoxHeading {
@@ -47,7 +49,9 @@
-/* Generalite */
+/**
+ * Generalites
+ */
*{
@@ -85,7 +89,9 @@
-/* general class */
+/**
+ * general class
+ */
.error{ color:@field_required; }
.alert{ color:#ae0405; }
.fright{ float:right; }
@@ -124,7 +130,7 @@
.messageStackError,
.messageStackWarning { background:@color_warning;}
.messageStackSuccess { background:@color_success; }
-.messageStackNotice { background:@color_notice;}
+.messageStackInfo { background:@color_notice;}
/* toogle item complet js action */
h4.Ctrtirroir,
@@ -140,14 +146,67 @@
+/* Section Notification */
+div#messageStack{
+ height: auto!important;
+ height: 25px;
+ min-height: 25px;
+ min-width:(@display_max_width * 0.75 ) ;
+ width:(@display_width * 0.75 ) ;
+ display:block;
+ position: absolute;
+ margin: 10px 1%;
+ right: 0;
+ top:0;
+ z-index:99;
+
+ p{
+ padding:0;
+ margin:0;
+ }
+ .item{
+ height: auto!important;
+ height: 25px;
+ min-height: 25px;
+ display:none;
+ padding: 0 0 0 30px;
+ margin: 2px 0 0 0;
+ font-size: 14px;
+ font-weight: bold;
+ line-height: 24px;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+
+
+ span.ButtonClose{
+ float:right;
+ display:inline-block;
+ min-width:25px;
+ height:25px;
+ margin:0 2px;
+ cursor : pointer;
+ background:transparent url("../../../../../images/check-off.png") center center no-repeat;
+ font-size:0;
+
+ &:hover{
+ opacity : 0.6;
+ }
+ }
+ }
+
+
+}
+
+
body {
background:#faf9f7 ;
background-attachment:fixed;
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -67,21 +67,6 @@
<?php echo $generic_modules->_show_menu(); /** Appel des menu specifique au module ACA . Tous module chargé epeut inétegrer des bock au menu */ ?>
</ul>
<?php endif; ?>
-<!-- <ul class="fright">
- <li class="w_30 nobr ">
- <form action="" method="post">
- <div>
- <select name="SearchSpeed">
- <option value="products" <?php if($page_module=='products') echo ' selected="selected" ' ?>><?php echo __('quicksearch products') ?></option>
- <option value="customers" <?php if($page_module=='customers') echo ' selected="selected" ' ?>><?php echo __('quicksearch customers') ?></option>
- <option value="categories" <?php if($page_module=='categories') echo ' selected="selected" ' ?>><?php echo __('quicksearch categories') ?></option>
- <option value="orders" <?php if($page_module=='orders') echo ' selected="selected" ' ?>><?php echo __('quicksearch orders') ?></option>
- </select>
- <input type='text' name="sSearch" value="<?php if(isset($_REQUEST['sSearch'])) echo $_REQUEST['sSearch']?>" onchange="this.form.submit();" />
- </div>
- </form>
- </li>
- </ul>-->
</div>
</header>
<!-- header_eof //-->
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -25,4 +25,5 @@
<a href="<?php echo tep_href_link('', 'mode_menu=1', 'NONSSL') ?>" class="messages"><?php echo __('Buyer menu') ?></a><span> | </span>
<?php endif; ?>
</div>
-<?php load_widget_context(); ?>
\ No newline at end of file
+<?php load_widget_context(); ?>
+
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/inc/lib_general-1.js
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/inc/lib_general-1.js 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/inc/lib_general-1.js 2012-08-09 18:22:08 UTC (rev 4569)
@@ -1,11 +1,4 @@
-function showmenu(num_id){
- for(i=0;i<8;i++){
- if (num_id !=='' && num_id===i) {
- $('#menu'+i+'Container').show().Fisheye({maxWidth: 90, items: 'a', itemsText: 'span', container: '.options', itemWidth: 50, proximity: 55, alignment: 'left', valign: 'top', halign: 'center'});
- }
- else {$('#menu'+i+'Container').hide();}
- }
-}
+
$(function(){
$(".adminBlock h3").click(function () {$(".adminBlock .tirroir").slideToggle("slow");});
-});
\ No newline at end of file
+});
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-09 18:22:08 UTC (rev 4569)
@@ -8,6 +8,7 @@
@encode UTF-8
*/
+
/* logo link partenaires */
#bas .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
#bas .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less 2012-08-09 18:22:08 UTC (rev 4569)
@@ -1,5 +1,6 @@
+/**
+ */
-
header#header {
background:@header_base_bg;
min-width:@display_max_width;
@@ -44,7 +45,7 @@
}
a {
- display:block;
+ display:inline-block;
text-decoration:none;
height:(@lineheight * 1.1);
text-align:center;
@@ -82,6 +83,7 @@
color:@submenu_link_hover ;
text-shadow: 0 1px 0 @submenu_link_hover_shadow;
text-decoration:none;
+ width:88%;
}
}
@@ -114,7 +116,9 @@
padding: 0 5px;
height:(@lineheight * 1.55);
- &:hover ul { display:block; }
+ &:hover ul {
+ display:block;
+ }
ul{
position:absolute;
@@ -132,6 +136,9 @@
.ssmenu li:hover ul.ssmenu,
.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+
+ .ssmenu li ul.ssmenu,
+ .ssmenu li ul.ssmenu li ul.ssmenu{ display:none; }
}
ul.fleft{
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-09 18:22:08 UTC (rev 4569)
@@ -18,7 +18,7 @@
}
/**
- * Reto-compatibilte oscommerce oscss < 2.xx
+ * Retro-compatibilte oscommerce oscss < 2.xx
*/
/* info box block droit */
.infoBoxHeading {
@@ -47,7 +47,9 @@
-/* Generalite */
+/**
+ * Generalite
+ */
*{
@@ -141,6 +143,59 @@
+/* Section Notification */
+div#messageStack{
+ height: auto!important;
+ height: 25px;
+ min-height: 25px;
+ min-width:(@display_max_width * 0.75 ) ;
+ width:(@display_width * 0.75 ) ;
+ display:block;
+ position: absolute;
+ margin: 10px 1%;
+ right: 0;
+ top:0;
+ z-index:99;
+
+
+ p{
+ padding:0;
+ margin:0;
+ }
+
+ .item{
+ height: auto!important;
+ height: 25px;
+ min-height: 25px;
+ display:none;
+ padding: 0 0 0 30px;
+ margin: 2px 0 0 0;
+ font-size: 14px;
+ font-weight: bold;
+ line-height: 24px;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+
+
+ span.ButtonClose{
+ float:right;
+ display:inline-block;
+ min-width:25px;
+ height:25px;
+ margin:0 2px;
+ cursor : pointer;
+ background:transparent url("../../../../../images/check-off.png") center center no-repeat;
+ font-size:0;
+
+ &:hover{
+ opacity : 0.6;
+ }
+ }
+ }
+
+
+}
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/inc/lib_general-1.js
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/inc/lib_general-1.js 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/inc/lib_general-1.js 2012-08-09 18:22:08 UTC (rev 4569)
@@ -8,23 +8,3 @@
* @encode UTF-8
* @brief
*/
-
-
-function showmenu(num_id){
- for(i=0;i<8;i++){
- if (num_id !=='' && num_id===i) {
- $('#menu'+i+'Container').show().Fisheye({maxWidth: 90, items: 'a', itemsText: 'span', container: '.options', itemWidth: 50, proximity: 55, alignment: 'left', valign: 'top', halign: 'center'});
- }
- else {$('#menu'+i+'Container').hide();}
- }
- }
- $(function(){
- $(".adminBlock h3").click(function () {$(".adminBlock .tirroir").slideToggle("slow");});
- });
-
-/*
- $(document).ready(function() {
- $(function() {
- $("#menutitre li ul li a").next('ul').prev().css("background-image", "url(images/icon/arrow-right.png)");
- });
- });*/
\ No newline at end of file
Modified: branches/2.1.1/catalog/common/classes/formUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-08 07:19:43 UTC (rev 4568)
+++ branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-09 18:22:08 UTC (rev 4569)
@@ -219,8 +219,8 @@
if (!tep_not_null($id)) $id=tep_output_string($name);
if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
for ($i=0, $n=sizeof($values); $i<$n; $i++) {
- $field .='<li>'.tep_draw_radio_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters).'</li>';
- $field .= $values[$i]['text'] . ' ';
+ $field .='<li>'.tep_draw_radio_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters);
+ $field .= $values[$i]['text'] . ' '.'</li>';
}
$field .= '</ul>';
if ($required == true) $field .= TEXT_FIELD_REQUIRED;
@@ -236,8 +236,8 @@
if (!tep_not_null($id)) $id=tep_output_string($name);
if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
for ($i=0, $n=sizeof($values); $i<$n; $i++) {
- $field .='<li>'.tep_draw_checkbox_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters).'</li>';
- $field .= $values[$i]['text'] . ' ';
+ $field .='<li>'.tep_draw_checkbox_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters);
+ $field .= $values[$i]['text'] . ' '.'</li>';
}
$field .= '</ul>';
if ($required == true) $field .= TEXT_FIELD_REQUIRED;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-08 07:19:50
|
Revision: 4568
http://oscss.svn.sourceforge.net/oscss/?rev=4568&view=rev
Author: oscim
Date: 2012-08-08 07:19:43 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/formUtility.php
Modified: branches/2.1.1/catalog/common/classes/formUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-05 20:42:00 UTC (rev 4567)
+++ branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-08 07:19:43 UTC (rev 4568)
@@ -219,7 +219,7 @@
if (!tep_not_null($id)) $id=tep_output_string($name);
if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
for ($i=0, $n=sizeof($values); $i<$n; $i++) {
- $field .=tep_draw_radio_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters);
+ $field .='<li>'.tep_draw_radio_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters).'</li>';
$field .= $values[$i]['text'] . ' ';
}
$field .= '</ul>';
@@ -236,7 +236,7 @@
if (!tep_not_null($id)) $id=tep_output_string($name);
if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
for ($i=0, $n=sizeof($values); $i<$n; $i++) {
- $field .=tep_draw_checkbox_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters);
+ $field .='<li>'.tep_draw_checkbox_field($name, $id.$i, tep_output_string($values[$i]['id']),( ($default == $values[$i]['id'])? true:false), $parameters).'</li>';
$field .= $values[$i]['text'] . ' ';
}
$field .= '</ul>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-05 20:42:06
|
Revision: 4567
http://oscss.svn.sourceforge.net/oscss/?rev=4567&view=rev
Author: oscim
Date: 2012-08-05 20:42:00 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
correction
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/header.php
Modified: branches/2.1.1/catalog/admin/includes/header.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/header.php 2012-08-05 08:37:25 UTC (rev 4566)
+++ branches/2.1.1/catalog/admin/includes/header.php 2012-08-05 20:42:00 UTC (rev 4567)
@@ -167,11 +167,10 @@
"fnServerData": function ( sSource, aoData, fnCallback ) {
<?php if(isset($_REQUEST['sSearch'])): ?>
- if(aoData[5].value ==""){
- aoData.push( { "name": "sSearch",
- "value": "<?php echo $_REQUEST['sSearch']; ?>" } );
- }
-
+ if(aoData[5].value ==""){
+ aoData.push( { "name": "sSearch",
+ "value": "<?php echo $_REQUEST['sSearch']; ?>" } );
+ }
<?php endif; ?>
$.ajax( {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-05 08:37:31
|
Revision: 4566
http://oscss.svn.sourceforge.net/oscss/?rev=4566&view=rev
Author: oscim
Date: 2012-08-05 08:37:25 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
suite travail theme BO
Ajout d'une medthode init() dans formutility afin de vider les caches , FIX bug datepicker dans les fomulaires
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
branches/2.1.1/catalog/common/classes/formUtility.php
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-05 08:37:25 UTC (rev 4566)
@@ -1027,6 +1027,7 @@
@brief Methode call for display Page / result
*/
public function display_view() {
+ formUtility::Init();
$action=self::$action;
switch(self::$action){
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-05 08:37:25 UTC (rev 4566)
@@ -149,7 +149,7 @@
body {
- background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background:#faf9f7 ;
background-attachment:fixed;
font: normal @font_size Verdana, Arial, sans-serif;
}
@@ -825,9 +825,9 @@
// UI tabs
- .ui-tabs {
+ div#glob .ui-tabs {
position: relative;
- padding: .2em;
+ padding: (@padding_base * 2);
zoom: 1;
.ui-tabs-nav {
@@ -839,13 +839,14 @@
float: left;
position: relative;
top: 1px;
- margin: 0 .1em 0 0;
+ margin: 0 @padding_base 0 0;
padding: 0;
white-space: nowrap;
+ line-height : (@lineheight * 1.2);
a {
float: left;
- padding: .3em 0.5em;
+ padding: (@padding_base * 2) (@padding_base * 4);
text-decoration: none;
cursor: pointer;
font-size: (@font_size*1.3);
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-05 08:37:25 UTC (rev 4566)
@@ -32,8 +32,8 @@
/* Normal Definition */
-@margin: 2%;
-@padding_base : 1%;
+@margin: 0.2em;
+@padding_base : 0.1em;
@lineheight: 16px;
@font_size : 11px;
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-05 08:37:25 UTC (rev 4566)
@@ -714,7 +714,23 @@
}
}
}
+
+
// UI
+
+
+ .ui-datepicker {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-datepicker-calendar{
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
+
/* Layout helpers */
.ui-dialog {
.ui-widget-header{
@@ -734,7 +750,7 @@
zoom: 1;
&:before,
- &:after { content: ""; display: table; }
+ &:after { display: table; }
&:after { clear: both; }
}
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
@@ -817,16 +833,17 @@
.ui-widget-header {
border-radius: 0;
- border-bottom: 1px solid #aaaaaa;
+// border-bottom: 1px solid #aaaaaa;
font-weight: bold;
}
// UI tabs
- .ui-tabs {
+ div#glob .ui-tabs {
position: relative;
- padding: .2em;
+ padding: (@padding_base * 2);
+ margin-top : (@margin * 1.5);
zoom: 1;
.ui-tabs-nav {
@@ -838,13 +855,13 @@
float: left;
position: relative;
top: 1px;
- margin: 0 .1em 0 0;
+ margin: 0 (@margin * 1.5) 0 0;
padding: 0;
white-space: nowrap;
a {
float: left;
- padding: .3em 0.5em;
+ padding: (@padding_base * 3) (@padding_base * 6);
text-decoration: none;
cursor: pointer;
font-size: (@font_size*1.3);
@@ -856,6 +873,10 @@
margin-bottom: 0;
padding-bottom: 1px;
cursor: not-drop;
+
+ a{
+ padding: (@padding_base * 3) (@padding_base * 6);
+ }
}
.ui-tabs-selected,
.ui-tabs-selected a,
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-05 08:37:25 UTC (rev 4566)
@@ -31,8 +31,8 @@
@display_width : 90% ;
/* Normal Definition */
-@margin: 2%;
-@padding_base : 1%;
+@margin: 0.2em;
+@padding_base : 0.1em;
@lineheight: 16px;
@font_size : 11px;
Modified: branches/2.1.1/catalog/common/classes/formUtility.php
===================================================================
--- branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-04 20:31:20 UTC (rev 4565)
+++ branches/2.1.1/catalog/common/classes/formUtility.php 2012-08-05 08:37:25 UTC (rev 4566)
@@ -15,17 +15,22 @@
*/
protected static $format=array(
-'image_submit'=>'<input type="submit" value="%s" title="%s" class="%s" %s />'
+ 'image_submit'=>'<input type="submit" value="%s" title="%s" class="%s" %s />'
);
static protected $id_check=array();
+ /**
+ @brief control and|or generate unique id for html balise
+ */
private static function gener_id($id_propose){
- if(!isset(self::$id_check[$id_propose])) return self::$id_check[$id_propose]=$id_propose;
+ if(!isset(self::$id_check[md5($id_propose)])){
+ self::$id_check[md5($id_propose)]=$id_propose;
+ return $id_propose;
+ }
else {
$id=$id_propose.rand(1,3);
-
- return self::gener_id($id);
+ return self::gener_id($id);
}
}
@@ -37,12 +42,18 @@
@return string id for css balise
*/
private static function HtmlAddId($id,$name){
- return (!empty($id))
- ? ' ' . 'id="' . str_replace(array('[',']'),array(''),tep_output_string(self::gener_id($id))) . '"'
- : ' ' . 'id="' . str_replace(array('[',']'),array(''),tep_output_string(self::gener_id($name))) . '"';
+ $txt = self::gener_id( ( (!empty($id)) ? $id :$name ) );
+ return ' ' . 'id="' . str_replace(array('[',']'),array(''),tep_output_string($txt) ) . '"' ;
}
/**
+ @fn Init()
+ */
+ public static function Init(){
+ self::$id_check=array();
+ }
+
+ /**
@fn UpFormat($key, $format)
@brief for update format sprintf for key , this var self::$format
@param $key string this name function call
@@ -92,6 +103,7 @@
@param $params param html
*/
public static function draw_form($name, $action, $parameters = '', $method = 'post', $params = '') {
+
$form = '<form id="' . tep_output_string($name) . '" action="';
if( (substr($action, 0, 4 ) !='http') ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 20:31:27
|
Revision: 4565
http://oscss.svn.sourceforge.net/oscss/?rev=4565&view=rev
Author: oscim
Date: 2012-08-04 20:31:20 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suite travail nettoyage et finalisation des themes
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/header.php
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Modified: branches/2.1.1/catalog/admin/includes/header.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/header.php 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/header.php 2012-08-04 20:31:20 UTC (rev 4565)
@@ -19,8 +19,8 @@
*/
tep_include_file (DIR_WS_JS."jquery.fancybox/jquery.fancybox.css",true);
if( ($css=tep_test_gab_ele("jquery-ui",'css')) !=false ) tep_include_file ($css,true);
- tep_include_file (DIR_WS_JS."jquery.dataTables/demo_table_jui.css",true);
+
tep_include_file (DIR_WS_JS."jquery.min.js",true);
tep_include_file ("includes/javascript/jquery-ui.min.js",true);
@@ -34,7 +34,6 @@
if(defined('JSONSTATMENT')){
//! plugin add tools table
- if( ($css=tep_test_gab_ele("TableTools",'css')) !=false ) tep_include_file ($css,true);
tep_include_file (DIR_WS_JS."dataTables.TableTools/ZeroClipboard/ZeroClipboard.js",true);
tep_include_file (DIR_WS_JS."dataTables.TableTools/js/TableTools.min.js",true);
}
@@ -217,10 +216,7 @@
$('div.toolbar').html('<?php echo TOOLBAR ?>');
-// function fnShowHide( iCol ) {
-// var bVis = oTable.fnSettings().aoColumns[iCol].bVisible;
-// oTable.fnSetColumnVis( iCol, bVis ? false : true );
-// }
+
<?php endif; ?>
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -1,4 +1,36 @@
/**
+ *
+ * Use var define in definition.less
+ * Use image based on /includes/javascript/jquery.dataTable
+ *
+ * @font_size
+ * @lineheight
+ *
+ * @color_012
+ * @bg_hover
+ * @bg_hover_txt
+ *
+ * @color_datatable_tr_th
+ * @color_datatable_tr_th_txt
+ *
+ * @bg_table_tr_odd
+ * @bg_table_tr_even
+ *
+ * @color_sorting base color for
+ *
+ * @color_split_active hover rows
+ * @color_split_active_text hover rows text
+ *
+ * @color_bg_gradient_base,
+ * @color_bg_gradient_eob,
+ * @color_bg_gradient_eon
+ *
+ * @color_bg_ext_datatable header and footer for dataTable
+ *
+ * @color_split
+ * @color_split_active
+ * @color_split_active_text
+ * @color_split_border_hover
*/
/**
@@ -33,7 +65,24 @@
text-shadow:none;
min-height:( @lineheight * 1.6 );
height:( @lineheight * 1.6 );
+ cursor: pointer;
}
+
+
+ .sorting_asc {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_asc.png") no-repeat center right;
+ padding-right: 20px;
+ }
+
+ .sorting_desc {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_desc.png") no-repeat center right;
+ padding-right: 20px;
+ }
+
+ .sorting {
+ background: @color_datatable_tr_th url("../../../../../includes/javascript/jquery.dataTables/sort_both.png") no-repeat center right;
+ padding-right: 20px;
+ }
}
@@ -46,6 +95,7 @@
border:none;
cursor:default;
+ .highlighted,
&:hover{
background-color: @bg_hover;
cursor: pointer;
@@ -99,6 +149,8 @@
text-align:left;
}
+
+
.sorting_1{
background-color: ( @color_sorting + 50);
}
@@ -133,6 +185,10 @@
.even{
background-color: @bg_table_tr_even;
}
+
+ .details {
+ background-color: #d1cfd0;
+ }
}
tfoot tr td input {width:80%;text-align:left;}
@@ -140,6 +196,8 @@
.dataTables_wrapper {
+ position: relative;
+ clear: both;
min-height:200px;
.bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
.box-shadow(2px 5px 3px rgba(0,0,0,0.5));
@@ -151,17 +209,52 @@
.rounded(5px);
.border-radius(5px,5px,5px,5px);
.box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ &:hover{
+ border:1px solid @color_split_border_hover;
+ background:white;
+ }
}
.paginate_active{
color : @color_split_active_text;
background-color: @color_split_active;
+
+ &:hover{
+ cursor: not-allowed !important;
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
}
}
+ .top,
+ .bottom {
+ padding: 1px 10px;
+ background-color: @color_bg_ext_datatable;
+
+ .dataTables_length {
+ clear: both;
+ float: left;
+ width: 40%;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ .dataTables_filter {
+ width: 50%;
+ float: right;
+ text-align: right;
+ }
+ }
+
.top{
- padding: 1px 10px;
.border-radius( 5px,0, 0, 5px);
+
.dataTables_filter {
clear: both;
@@ -170,10 +263,7 @@
text-align: right;
margin-bottom: 5px;
}
- .dataTables_length {
- float: left;
- width: 40%;
- }
+
.dataTables_paginate {
float: right;
text-align: right;
@@ -190,17 +280,173 @@
padding:0;
height:34px;
}
-
- .dataTables_length {
- float: left;
- width: 40%;
- }
-
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
-
+
}
-}
\ No newline at end of file
+}
+
+
+/* Pagination */
+.paging_full_numbers{
+ width: auto;
+}
+
+.paging_full_numbers span.paginate_button,
+.paging_full_numbers span.paginate_active {
+ border: 1px solid #aaa;
+ padding: 2px 5px;
+ margin: 0 3px;
+ cursor: pointer;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+}
+
+
+
+.paging_full_numbers .fg-button {
+ padding: 2px 6px;
+ cursor: pointer;
+}
+
+
+.fg-toolbar {
+ padding: 5px;
+}
+
+.dataTables_paginate {
+ width: auto;
+}
+
+
+
+
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables features
+ */
+
+
+
+.dataTables_processing {
+ position: absolute;
+ top: 0px;
+ left: 50%;
+ width: 250px;
+ margin-left: -125px;
+ border: 1px solid #ddd;
+ text-align: center;
+ color: #999;
+ font-size: 11px;
+ padding: 2px 0;
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Misc
+ */
+
+
+
+.dataTables_empty {
+ text-align: center;
+}
+
+
+
+.TableTools {
+ padding: 3px 0 3px 3px;
+ border: 1px solid #d0d0d0;
+ background-color: #f0f0f0;
+ float: right;
+ margin-bottom: 1em;
+}
+
+.TableTools_button {
+ position: relative;
+ float: left;
+ margin-right: 3px;
+}
+
+.TableTools_csv {
+ background: url("../../../../../images/icons/csv.png") no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_csv_hover {
+ background: url("../../../../../images/icons/csv_hover.png") no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_xls {
+ background: url("../../../../../images/icons/xls.png") no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_xls_hover {
+ background: url("../../../../../images/icons/xls_hover.png") no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_clipboard {
+ background: url("../../../../../images/icons/copy.png") no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_clipboard_hover {
+ background: url("../../../../../images/icons/copy_hover.png") no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_print {
+ background: url("../../../../../images/icons/print.png") no-repeat center center;
+ border: 1px solid #f0f0f0;
+}
+
+.TableTools_print_hover {
+ background: url("../../../../../images/icons/print_hover.png") no-repeat center center;
+ border: 1px solid #d0d0d0;
+ background-color: #fdfdfd;
+}
+
+.TableTools_PrintInfo {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 400px;
+ height: 150px;
+ margin-left: -200px;
+ margin-top: -75px;
+ text-align: center;
+ background-color: #3f3f3f;
+ color: white;
+ padding: 10px 30px;
+
+ opacity: 0.9;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+ -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
+}
+
+.TableTools_PrintInfo h6 {
+ font-weight: normal;
+ font-size: 28px;
+ line-height: 28px;
+ margin: 1em;
+}
+
+.TableTools_PrintInfo p {
+ font-size: 14px;
+ line-height: 20px;
+}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -1,206 +1,152 @@
/**
*/
- /**
- * Dipslay all listing in array
- */
- .dataTableBase,
- .dataTableSearch,
- .dataTable{
- width:100%;
- border-width:0;
- border:1px solid @color_012;
+
+
+input,
+select,
+textarea,
+button {
+ padding:(@padding_base * 0.3) ;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
+ border:1px solid @bg_input_border;
+ background: @bg_input ;
+ .border-radius(5px);
+ .rounded(5px);
+
+ &:hover{
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+}
+
+
+
+
+// master central display
+form{
+ padding:0;
+
+ label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+
+ fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+
+ textarea{ vertical-align:baseline;}
+
+ p{
+
+ input[type="checkbox"] { float:right; }
+
+ select,
+ input[type="text"] {
+ margin:5px 15px;
+ }
+ select{
+ padding:1px 0 0 0;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
+ p.new_product_img {
+ float:left;
+ padding:5px;
+ margin : 0 auto;
+ text-align:center;
+ width:98%;
+ border:1px solid @color_012;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ margin:auto;
+ max-width: 300px;
+ }
+ }
+
+
+ ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
+
+ .block_form {
+ .block_input{
+ text-shadow:0 1px 0 #fff;
+ width:94.9%;
+ margin:2px 1px;
+ display:inline-block;
+ text-align: left;
+ background:#C9C9C9;
+ float:left;
+ line-height:18px;
+ padding:5px 5px 10px 5px;
+ border:1px solid @color_014;
+ .border-radius(5px);
.rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- a.button,
- input[type=submit].button,
- input[type=image].button,
- button.button {
- margin:0;
- }
+ span.value_edit {clear:both;display:inline-block; width:100%;}
- tr {
- padding:0;
- margin:0;
-
- th{
- background-color: @color_datatable_tr_th;
- font-size:@font_size;
- font-weight:bold;
- text-align:center;
- color: @color_datatable_tr_th_txt;
- text-shadow:none;
- min-height:( @lineheight * 1.6 );
- height:( @lineheight * 1.6 );
- }
- }
+ br,
+ span.value_edit br{display:none;}
+ label br {display:inline-block;}
- tbody{
+ span.edit-input,
+ span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
+ span.edit-input{
+ white-space:nowrap;
- // rollover rows for mouse
- tr,
- tr.odd,
- tr.even{
- border:none;
- cursor:default;
-
- &:hover{
- background-color: @bg_hover;
- cursor: pointer;
-
- td{
- background-color: @bg_hover;
- }
- td,
- td a {
- color : @bg_hover_txt ;
- }
- }
-
- td{
- line-height:( @lineheight * 1.1 );
- color: @datatable_color_txt;
- padding: 2px;
- font-size: @font_size;
- cursor:default;
-
- a{
- text-decoration:none;
- color: @datatable_color_txt;
- }
-
- /* Replace value by icon */
- .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
-
- .edit-input-value .Flag-0.txt,
- .edit-input-value .Val-0.txt { display:none}
- .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
- .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
-
- .edit-input-value .Flag-1.txt,
- .edit-input-value .Val-1.txt { display:none}
- .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
- .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
- }
- .row_action {
- min-width:100px;
- text-align:right;
- }
-
- .row_action_large {
- min-width:250px;
- text-align:right;
- }
-
- .row_customers {
- min-width:100px;
- text-align:left;
- }
-
- .sorting_1{
- background-color: ( @color_sorting + 50);
- }
- .sorting_1,
- .sorting_1 a{
- color : ( @color_sorting_text + 50);
- }
-
- .sorting_2{
- background-color:( @color_sorting + 65);
- }
- .sorting_2,
- .sorting_2 a{
- color :( @color_sorting_text + 65);
- }
-
- .sorting_3{
- background-color:( @color_sorting + 80);
- }
- .sorting_3,
- .sorting_3 a{
- color : (@color_sorting_text + 80);
- }
-
-
- }
+ input{float: left;}
- .odd{
- background-color: @bg_table_tr_odd;
- }
-
- .even{
- background-color: @bg_table_tr_even;
- }
+ .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+ .edit-input-value {padding-left:12px;}
+ /* remplacement true /false par icone */
+ .edit-input-value.Val-true ,
+ .edit-input-value.Val-false {font-size:0;}
+ .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
+ .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
}
-
- tfoot tr td input {width:80%;text-align:left;}
}
+ .block_input.tirroir {float:none;}
- .dataTables_wrapper {
- min-height:200px;
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- .paging_full_numbers{
-
- .paginate_button,
- .paginate_active{
- .rounded(5px);
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- .paginate_active{
- color : @color_split_active_text;
- background-color: @color_split_active;
- }
- }
-
- .top{
- padding: 1px 10px;
- .border-radius( 5px,0, 0, 5px);
-
- .dataTables_filter {
- clear: both;
- position: relative;
- right: 0;
- text-align: right;
- margin-bottom: 5px;
- }
- .dataTables_length {
- float: left;
- width: 40%;
- }
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
- }
-
- .bottom {
- padding: 5px 10px;
- .border-radius( 0, 5px, 5px, 0);
-
- .TableTools {
- margin: 0 0 5px 0;
- padding:0;
- height:34px;
- }
-
- .dataTables_length {
- float: left;
- width: 40%;
- }
-
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
-
- }
- }
\ No newline at end of file
+ .tabs_lang{width:98.5%; float:left;}
+ }
+
+ .block_field {
+ text-shadow:0 1px 0 #fff;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px;
+ float:left;
+
+ .tabs,
+ .tabs_lang{
+ width:96.5%;
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
+ float:left;
+ }
+
+ .tabs_lang ul.ui-tabs-nav,
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
+ }
+
+ .block_input label.inline { white-space:nowrap; width: 20%;}
+
+ .edit.col_right .block_input{
+ width:95%;
+
+ label{width:20%;text-align:left;font-weight:bold}
+ }
+
+ .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+
+ .input-multi input[type="checkbox"],
+ .input-multi input[type="radio"]{float:none;}
+
+
+}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -109,6 +109,7 @@
.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
.linkdoc {font-size:@font_size; font-weight:bold; }
+.clear ,
.spacer,
.separator{clear:both;}
.fieldRequired { color: @field_required; }
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -133,25 +133,35 @@
@color_widget_bg_th : @color_010; // th
// block div edit / input gradient background
-@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_base : #E4E4E4; // base color
@color_bg_gradient_eob : 200; // deb gradient
@color_bg_gradient_eon : 255; // end gradient
+
+
// Table Datatable
-@color_datatable_tr_th : @color_010 ;
-@color_datatable_tr_th_txt : @color_011 ;
-@datatable_color_txt :#000000 ; // couleur text dans les tableau
+ //
+ @color_datatable_tr_th : @color_010 ;
+ @color_datatable_tr_th_txt : @color_011 ;
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
-@bg_hover : #E6FF99; // hover row or filter
-@bg_hover_txt : #000000; // hover row or filter
+ @bg_hover : #E6FF99; // hover row or filter
+ @bg_hover_txt : #000000; // hover row or filter
-@bg_table_tr_odd : #F0F0F0;
-@bg_table_tr_even : @color_014;
-@color_sorting : #84509A; // cols sorting
-@color_sorting_text : #A7A7A7;
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : @color_014;
+ @color_sorting : #84509A; // cols sorting
+ @color_sorting_text : #A7A7A7; // col sorting text
+ @color_bg_ext_datatable :#E4E4E4 ; // bg header/footer datatable
+ // Split page / Pagination
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+ @color_split_border_hover : @color_010;
+
// FORM
@bg_input : @color_011;
@bg_input_border : @color_012;
@@ -160,12 +170,6 @@
-/**
- * Split page / Pagination
- */
- @color_split : @color_010;
- @color_split_active : @color_010;
- @color_split_active_text : #FFFFFF;
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -109,6 +109,7 @@
.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
.linkdoc {font-size:@font_size; font-weight:bold; }
+.clear ,
.spacer,
.separator{clear:both;}
.fieldRequired { color: @field_required; }
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 19:48:54 UTC (rev 4564)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 20:31:20 UTC (rev 4565)
@@ -136,19 +136,27 @@
// Table Datatable
-@color_datatable_tr_th : @color_010 ;
-@color_datatable_tr_th_txt : @color_011 ;
-@datatable_color_txt :#000000 ; // couleur text dans les tableau
+ //
+ @color_datatable_tr_th : @color_010 ;
+ @color_datatable_tr_th_txt : @color_011 ;
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
-@bg_hover : #E6FF99; // hover row or filter
-@bg_hover_txt : #000000; // hover row or filter
+ @bg_hover : #E6FF99; // hover row or filter
+ @bg_hover_txt : #000000; // hover row or filter
-@bg_table_tr_odd : #F0F0F0;
-@bg_table_tr_even : @color_014;
-@color_sorting : #84509A; // cols sorting
-@color_sorting_text : #A7A7A7;
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : @color_014;
+ @color_sorting : #84509A; // cols sorting
+ @color_sorting_text : #A7A7A7;
+ @color_bg_ext_datatable :#E4E4E4 ; // bg header/footer datatable
+ //Split page / Pagination
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+ @color_split_border_hover : @color_010;
+
// FORM
@bg_input : @color_011;
@bg_input_border : @color_012;
@@ -158,11 +166,8 @@
/**
- * Split page / Pagination
+ *
*/
- @color_split : @color_010;
- @color_split_active : @color_010;
- @color_split_active_text : #FFFFFF;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 19:49:00
|
Revision: 4564
http://oscss.svn.sourceforge.net/oscss/?rev=4564&view=rev
Author: oscim
Date: 2012-08-04 19:48:54 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suppression element obsolete
Removed Paths:
-------------
branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/back_disabled.jpg
branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/back_enabled.jpg
branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/forward_disabled.jpg
branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/forward_enabled.jpg
branches/2.1.1/catalog/admin/includes/template/defaut/TableTools-1.css
branches/2.1.1/catalog/admin/includes/template/oscss/TableTools-1.css
Deleted: branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/back_disabled.jpg
===================================================================
(Binary files differ)
Deleted: branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/back_enabled.jpg
===================================================================
(Binary files differ)
Deleted: branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/forward_disabled.jpg
===================================================================
(Binary files differ)
Deleted: branches/2.1.1/catalog/admin/includes/javascript/jquery.dataTables/forward_enabled.jpg
===================================================================
(Binary files differ)
Deleted: branches/2.1.1/catalog/admin/includes/template/defaut/TableTools-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/TableTools-1.css 2012-08-04 16:16:09 UTC (rev 4563)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/TableTools-1.css 2012-08-04 19:48:54 UTC (rev 4564)
@@ -1,97 +0,0 @@
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * TableTools styles
- */
-.TableTools {
- padding: 3px 0 3px 3px;
- border: 1px solid #d0d0d0;
- background-color: #f0f0f0;
- float: right;
- margin-bottom: 1em;
-}
-
-.TableTools_button {
- position: relative;
- float: left;
- margin-right: 3px;
-}
-
-.TableTools_csv {
- background: url(../../../images/icons/csv.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_csv_hover {
- background: url(../../../images/icons/csv_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_xls {
- background: url(../../../images/icons/xls.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_xls_hover {
- background: url(../../../images/icons/xls_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_clipboard {
- background: url(../../../images/icons/copy.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_clipboard_hover {
- background: url(../../../images/icons/copy_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_print {
- background: url(../../../images/icons/print.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_print_hover {
- background: url(../../../images/icons/print_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_PrintInfo {
- position: absolute;
- top: 50%;
- left: 50%;
- width: 400px;
- height: 150px;
- margin-left: -200px;
- margin-top: -75px;
- text-align: center;
- background-color: #3f3f3f;
- color: white;
- padding: 10px 30px;
-
- opacity: 0.9;
-
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
- -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
-}
-
-.TableTools_PrintInfo h6 {
- font-weight: normal;
- font-size: 28px;
- line-height: 28px;
- margin: 1em;
-}
-
-.TableTools_PrintInfo p {
- font-size: 14px;
- line-height: 20px;
-}
Deleted: branches/2.1.1/catalog/admin/includes/template/oscss/TableTools-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/TableTools-1.css 2012-08-04 16:16:09 UTC (rev 4563)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/TableTools-1.css 2012-08-04 19:48:54 UTC (rev 4564)
@@ -1,97 +0,0 @@
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * TableTools styles
- */
-.TableTools {
- padding: 3px 0 3px 3px;
- border: 1px solid #d0d0d0;
- background-color: #f0f0f0;
- float: right;
- margin-bottom: 1em;
-}
-
-.TableTools_button {
- position: relative;
- float: left;
- margin-right: 3px;
-}
-
-.TableTools_csv {
- background: url(../../../images/icons/csv.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_csv_hover {
- background: url(../../../images/icons/csv_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_xls {
- background: url(../../../images/icons/xls.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_xls_hover {
- background: url(../../../images/icons/xls_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_clipboard {
- background: url(../../../images/icons/copy.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_clipboard_hover {
- background: url(../../../images/icons/copy_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_print {
- background: url(../../../images/icons/print.png) no-repeat center center;
- border: 1px solid #f0f0f0;
-}
-
-.TableTools_print_hover {
- background: url(../../../images/icons/print_hover.png) no-repeat center center;
- border: 1px solid #d0d0d0;
- background-color: #fdfdfd;
-}
-
-.TableTools_PrintInfo {
- position: absolute;
- top: 50%;
- left: 50%;
- width: 400px;
- height: 150px;
- margin-left: -200px;
- margin-top: -75px;
- text-align: center;
- background-color: #3f3f3f;
- color: white;
- padding: 10px 30px;
-
- opacity: 0.9;
-
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-
- box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
- -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5);
-}
-
-.TableTools_PrintInfo h6 {
- font-weight: normal;
- font-size: 28px;
- line-height: 28px;
- margin: 1em;
-}
-
-.TableTools_PrintInfo p {
- font-size: 14px;
- line-height: 20px;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 16:16:16
|
Revision: 4563
http://oscss.svn.sourceforge.net/oscss/?rev=4563&view=rev
Author: oscim
Date: 2012-08-04 16:16:09 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suppression element obsolete
Removed Paths:
-------------
branches/2.1.1/catalog/admin/includes/template/defaut/element.less
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
Deleted: branches/2.1.1/catalog/admin/includes/template/defaut/element.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/element.less 2012-08-04 16:15:12 UTC (rev 4562)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/element.less 2012-08-04 16:16:09 UTC (rev 4563)
@@ -1,136 +0,0 @@
-/*---------------------------------------------------
- * LESS Elements 0.6
- * ---------------------------------------------------
- * A set of useful LESS mixins by Dmitry Fadeyev
- * Special thanks for mixin suggestions to:
- * Kris Van Herzeele,
- * Benoit Adam,
- * Portenart Emile-Victor,
- * Ryan Faerman
- *
- * More info at: http://lesselements.com
- * -----------------------------------------------------*/
-
-.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
- background: @color;
- background: -webkit-gradient(linear,
- left bottom,
- left top,
- color-stop(0, @start),
- color-stop(1, @stop));
- background: -ms-linear-gradient(bottom,
- @start,
- @stop);
- background: -moz-linear-gradient(center bottom,
- @start 0%,
- @stop 100%);
-}
-.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
- background: @color;
- background: -webkit-gradient(linear,
- left bottom,
- left top,
- color-stop(0, rgb(@start,@start,@start)),
- color-stop(1, rgb(@stop,@stop,@stop)));
- background: -ms-linear-gradient(bottom,
- rgb(@start,@start,@start) 0%,
- rgb(@start,@start,@start) 100%);
- background: -moz-linear-gradient(center bottom,
- rgb(@start,@start,@start) 0%,
- rgb(@stop,@stop,@stop) 100%);
-}
-.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
- border-top: solid 1px @top-color;
- border-left: solid 1px @left-color;
- border-right: solid 1px @right-color;
- border-bottom: solid 1px @bottom-color;
-}
-.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
- -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
- -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
- box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
-}
-.rounded(@radius: 2px) {
- -webkit-border-radius: @radius;
- -moz-border-radius: @radius;
- border-radius: @radius;
- -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-}
-.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
- -webkit-border-top-right-radius: @topright;
- -webkit-border-bottom-right-radius: @bottomright;
- -webkit-border-bottom-left-radius: @bottomleft;
- -webkit-border-top-left-radius: @topleft;
- -moz-border-radius-topright: @topright;
- -moz-border-radius-bottomright: @bottomright;
- -moz-border-radius-bottomleft: @bottomleft;
- -moz-border-radius-topleft: @topleft;
- border-top-right-radius: @topright;
- border-bottom-right-radius: @bottomright;
- border-bottom-left-radius: @bottomleft;
- border-top-left-radius: @topleft;
- -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-}
-.opacity(@opacity: 0.5) {
- -moz-opacity: @opacity;
- -khtml-opacity: @opacity;
- -webkit-opacity: @opacity;
- opacity: @opacity;
-}
-.transition-duration(@duration: 0.2s) {
- -moz-transition-duration: @duration;
- -webkit-transition-duration: @duration;
- transition-duration: @duration;
-}
-.rotation(@deg:5deg){
- -webkit-transform: rotate(@deg);
- -moz-transform: rotate(@deg);
- transform: rotate(@deg);
-}
-.scale(@ratio:1.5){
- -webkit-transform:scale(@ratio);
- -moz-transform:scale(@ratio);
- transform:scale(@ratio);
-}
-.transition(@duration:0.2s, @ease:ease-out) {
- -webkit-transition: all @duration @ease;
- -moz-transition: all @duration @ease;
- transition: all @duration @ease;
-}
-.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
- -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
- -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
- box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
-}
-.box-shadow(@arguments) {
- -webkit-box-shadow: @arguments;
- -moz-box-shadow: @arguments;
- box-shadow: @arguments;
-}
-.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
- -moz-column-width: @colwidth;
- -moz-column-count: @colcount;
- -moz-column-gap: @colgap;
- -moz-column-rule-color: @columnRuleColor;
- -moz-column-rule-style: @columnRuleStyle;
- -moz-column-rule-width: @columnRuleWidth;
- -webkit-column-width: @colwidth;
- -webkit-column-count: @colcount;
- -webkit-column-gap: @colgap;
- -webkit-column-rule-color: @columnRuleColor;
- -webkit-column-rule-style: @columnRuleStyle;
- -webkit-column-rule-width: @columnRuleWidth;
- column-width: @colwidth;
- column-count: @colcount;
- column-gap: @colgap;
- column-rule-color: @columnRuleColor;
- column-rule-style: @columnRuleStyle;
- column-rule-width: @columnRuleWidth;
-}
-.translate(@x:0, @y:0) {
- -moz-transform: translate(@x, @y);
- -webkit-transform: translate(@x, @y);
- -o-transform: translate(@x, @y);
- -ms-transform: translate(@x, @y);
- transform: translate(@x, @y);
-}
Deleted: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 16:15:12 UTC (rev 4562)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 16:16:09 UTC (rev 4563)
@@ -1,1249 +0,0 @@
-/**
- * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
- * @portion code Copyright (c) 2002 osCommerce
- * @package osCSS-2 <www http://www.oscss.org>
- * @version 2.1.1
- * @date 01/01/2012, 18:17
- * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- * @encode UTF-8
- */
-
-/* Mixin */
-
-.wrap () {
- text-wrap: wrap;
- white-space: pre-wrap;
- white-space: -moz-pre-wrap;
- word-wrap: break-word;
-}
-
-/**
- * Reto-compatibilte oscommerce oscss < 2.xx
- */
-/* info box block droit */
-.infoBoxHeading {
- background-color: #ffffff;
- border-width:0;
- .rounded(5px);
-}
-.infoBoxContent{
- border-width: 0px 1px 0px 1px;
- border-color: #E6E6E6;
- border-style: solid;
- padding: 2px 2px 5px 10px;
- font-size: 10px;
- color: #000;
- background-color: #f1f1f1;
- list-style:none;
- line-height:1.7em;
- .rounded(5px);
-}
-.infoBoxContent li{clear:both; }
-
-
-
-
-
-
-
-
-/* Generalite */
-
-
-*{
- margin:0;
- padding:0;
- text-shadow:none;
- border:0;
-}
-a :link,
-a:visited {text-decoration: underline; color:#000;}
-a:hover { text-decoration: none; }
-img { border:0 ; margin:0; padding:0; }
-h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
-h2 { font-size:(@font_size * 1.2) ;}
-h3 {
- clear:both;
- color: @title_h3_color;
- font-size: (@font_size * 1.9);
- font-weight: bold;
- padding: @padding_base 0 @padding_base (@padding_base * 1.2);
- text-shadow: 0 1px 1px @title_h3_color_shadow ;
-}
-h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
-h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
-p {padding:1em;}
-ul {list-style:none;}
-th {
- margin:2px 1px;
- text-align: left;
- padding: 2px @padding_base;
- height:@lineheight;
- line-height:(@lineheight * 0.7);
-}
-
-input,
-select,
-textarea,
-button {
- padding:(@padding_base * 0.3) ;
- font-family: Verdana,Arial,sans-serif;
- font-size: (@font_size*1.3);
- border:1px solid @bg_input_border;
- background: @bg_input ;
- .border-radius(5px);
- .rounded(5px);
-
- &:hover{
- border:1px solid @bg_input_border_hover;
- background: @bg_input_hover ;
- }
-}
-
-
-/* general class */
-.error{ color:@field_required; }
-.alert{ color:#ae0405; }
-.fright{ float:right; }
-.fleft {float:left; }
-.tleft{text-align:left}
-.tright{text-align:right}
-.tcenter{text-align:center}
-.inline ,
-.inline *,
-div#central .inline *{ display:inline-block; }
-.nobr {white-space:nowrap;}
-
-.w_100 {width:99%;}
-.w_90 {width:89%;}
-.w_80 {width:79%;}
-.w_70 {width:69%;}
-.w_60 {width:59%;}
-.w_50 {width:49%;}
-.w_40 {width:39%;}
-.w_30 {width:29%;}
-.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
-.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
-.linkdoc {font-size:@font_size; font-weight:bold; }
-.spacer {clear:both;}
-.fieldRequired { color: @field_required; }
-.smallText { font-size: (@font_size * 0.8); }
-.errorText { color: @field_required; }
-
-
-/* --- message box --- */
-.messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
-.messageStack{ font-family: Verdana, Arial, sans-serif;}
-.messageStack li{padding:(@padding_base * 0.2);}
-.messageStackError,
-.messageStackWarning { background:@color_warning;}
-.messageStackSuccess { background:@color_success; }
-.messageStackNotice { background:@color_notice;}
-
-/* toogle item complet js action */
-h4.Ctrtirroir,
-h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 (@padding_base * 2); font-size: (@font_size * 1.1); }
-.Ctrtirroir {
- background:transparent url('../../../images/icons/icon_down.gif') left top no-repeat;
- padding-left:(@padding_base * 2);
- height:@lineheight;
-}
-.Ctrtirroir.closed {background:transparent url('../../../images/icons/icon_arrow_right.gif') left top no-repeat; }
-fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
-
-
-
-
-
-
-
-
-
-
-
-
-body {
- background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
- background-attachment:fixed;
- font: normal @font_size Verdana, Arial, sans-serif;
-}
-
-
-/**
- * Structure base html
- * no specific forms (cf section forms )
- */
-
-.configuration{
- div#central{
-
- div#ssmenu{
- display: block;
- height: ( @lineheight * 1.5);
- line-height: ( @lineheight * 1.5);
- padding: 5px 10px;
- width: 100%;
- }
-
- div.box_right {
- right:0;
- width:39%;
-
- ul{ list-style:none; }
- }
- }
-}
-
-// .page {
- // div#central{
- // }
- // }
-
- div#glob {
- width:100%;
- z-index:10;
- height:100%;
-
-
-
- div#central{
- position:relative;
- padding:10px 5px;
- top:79px;
- margin-bottom: 79px;
- border-left: 1px solid black;
- border-right: 1px solid black;
- border-bottom: 1px solid black;
- background:@color_011;
-
- div.box_uniq {
- width:100%;
- float:left;
- padding: 0;
- background:none;
- }
-
- div.box_left { width:60%; float:left; }
-
- div.box_right {
- width:39%;
- float:right;
- }
-
- h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
- }
-
- }
-
- div#center,
- div#bas {
- margin: 0 auto;
- position: relative;
- min-width:@display_max_width;
- width:@display_width ;
- }
-
- div#bas {
- // margin-top:8em;
- clear:both;
- height:25px;
- background:@color_013;
- color:@color_011;
-
- a,
- a:link,
- a:visited {
- text-shadow : none;
- padding: 4px 25px;
- color:@color_011;
- }
-
- // logo link partenaires
- .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
- }
- footer {
- background: #505050;
- clear:both;width:100%;
- text-align:center;
- color:@color_011;
-
- a,
- a:link,
- a:visited {
- color:@color_011;
- text-decoration: none;
-
- &:hover{
- text-decoration: underline;
- }
- }
- }
-
-
-
-
- /**
- * Bouton
- */
- .button,
- select.button,
- input[type=submit].button,
- input[type=button].button,
- button.button,
- a.button{
- display: inline-block;
- font-family:Arial;
- white-space:nowrap;
- float:right;
- color:@color_011;
- vertical-align:middle;
- border:1px solid #fff;
- height: ( @lineheight * 1.6);
- line-height: 25px;
- margin:8px 20px;
- text-shadow: none;
-
- .rounded(5px);
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
- input[type=image].button {
- float:left;
- height:( @lineheight * 1.3);
- width:18px;
- }
-
- input.button,
- button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
-
-
- a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none; height:( @lineheight * 1.3) ; line-height:( @lineheight * 1.3);}
- a.button:hover{color:@color_011;text-decoration:none; }
-
- a.button,
- select.button,
- input.button,
- button.button {
- .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
- }
-
- a.button.ActionYes,
- input.button.ActionYes,
- input[type=image].button.ActionYes,
- input[type=submit].button.ActionYes,
- button.button.ActionYes {
- .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
- }
-
- a.button.ActionBack,
- input[type=image].button.ActionBack,
- button.button.ActionBack {
- color:@color_011;
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
- }
-
-
- input:hover.button,
- button:hover.button{background:#797979;color:@color_011;}
-
- a:hover.button,
- input:hover.button,
- button:hover.button {
- .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
- opacity:0.6;
- }
-
- a:hover.button.ActionYes,
- input:hover.button.ActionYes,
- button:hover.button.ActionYes {
- .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
- color:black;
- }
-
- a.button.ActionBack,
- input.button.ActionBack,
- button.button.ActionBack {
- color:@color_011;
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
- }
-
- a:hover.button.ActionBack,
- input:hover.button.ActionBack,
- button:hover.button.ActionBack {
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
- }
-
- input[type=image].button,
- a.buttonimg img{ opacity:1;}
-
- input[type=image]:hover.button ,
- a:hover.buttonimg img,
- a.buttonimg img:hover{ opacity:0.6;}
-
- /* Spe buttons broswer img */
- a.button.browser {height:24px;}
- a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
- .row_action a.button {margin:0;}
-
-
- /* Block html content all bouton */
- .button_nav{
- clear:both;
-
- form{
- float:right;
- width:100px;
-
- p {margin:0;padding:0;}
- }
- }
-
-
- /**
- * Section for block widget in dashbord
- */
- .widget{
- float: left;
- margin: @margin ( @margin *0.5);
- width: (100% - (@margin * 1) );
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- h3 {
- color: @color_widget_title;
- clear: both;
- margin-bottom:@margin;
- padding:5px 0 5px 5px;
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
-
- a{
- color: @color_widget_title;
- text-decoration:none;
-
- &:hover{
- color: gray;
- }
- }
- }
-
- ol {padding-left:25px;}
-
- .dataTableBase tr{
- background-color: #F0F0F0;
-
- th {
- height: 20px;
- line-height: 20px;
- background : @color_widget_bg_th;
- }
-
- &:nth-child(odd) {
- background-color: #D7D7D7;
- }
-
- a{
- font-weight : bold;
- color: @color_widget_bg_th;
- }
- }
-
-
- /* sous menu en widget , specifique page conf et dashboard configuration */
- div#ssmenu{
- a {
- background: none repeat scroll 0 0 #797979;
- border-right: 1px solid #444444;
- clear: both;
- color: @color_011;
- font-size: @font_size;
- margin: 0 0 1px 25px;
- padding: 5px 10px;
- text-shadow: 0 1px 0 #000000;
- width: 40%;
-
- &:hover {
- float:left;
- margin:0;
- background:#eee;
- color:#000;
- text-shadow: 0 1px 0 #fff;
- }
- }
- }
- }
-
-
- .edit{
- background:#eee;
- background-attachment:none;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
-
- /**
- * Dipslay all listing in array
- */
- .dataTableBase,
- .dataTableSearch,
- .dataTable{
- width:100%;
- border-width:0;
- border:1px solid @color_012;
- .rounded(5px);
-
- a.button,
- input[type=submit].button,
- input[type=image].button,
- button.button {
- margin:0;
- }
-
-
- tr {
- padding:0;
- margin:0;
-
- th{
- background-color: @color_datatable_tr_th;
- font-size:@font_size;
- font-weight:bold;
- text-align:center;
- color: @color_datatable_tr_th_txt;
- text-shadow:none;
- min-height:( @lineheight * 1.6 );
- height:( @lineheight * 1.6 );
- }
- }
-
-
- tbody{
-
- // rollover rows for mouse
- tr,
- tr.odd,
- tr.even{
- border:none;
- cursor:default;
-
- &:hover{
- background-color: @bg_hover;
- cursor: pointer;
-
- td{
- background-color: @bg_hover;
- }
- td,
- td a {
- color : @bg_hover_txt ;
- }
- }
-
- td{
- line-height:( @lineheight * 1.1 );
- color: @datatable_color_txt;
- padding: 2px;
- font-size: @font_size;
- cursor:default;
-
- a{
- text-decoration:none;
- color: @datatable_color_txt;
- }
-
- /* Replace value by icon */
- .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
-
- .edit-input-value .Flag-0.txt,
- .edit-input-value .Val-0.txt { display:none}
- .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
- .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
-
- .edit-input-value .Flag-1.txt,
- .edit-input-value .Val-1.txt { display:none}
- .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
- .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
- }
- .row_action {
- min-width:100px;
- text-align:right;
- }
-
- .row_action_large {
- min-width:250px;
- text-align:right;
- }
-
- .row_customers {
- min-width:100px;
- text-align:left;
- }
-
- .sorting_1{
- background-color: ( @color_sorting + 50);
- }
- .sorting_1,
- .sorting_1 a{
- color : ( @color_sorting_text + 50);
- }
-
- .sorting_2{
- background-color:( @color_sorting + 65);
- }
- .sorting_2,
- .sorting_2 a{
- color :( @color_sorting_text + 65);
- }
-
- .sorting_3{
- background-color:( @color_sorting + 80);
- }
- .sorting_3,
- .sorting_3 a{
- color : (@color_sorting_text + 80);
- }
-
-
- }
-
- .odd{
- background-color: @bg_table_tr_odd;
- }
-
- .even{
- background-color: @bg_table_tr_even;
- }
- }
-
- tfoot tr td input {width:80%;text-align:left;}
- }
-
-
- .dataTables_wrapper {
- min-height:200px;
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- .paging_full_numbers{
-
- .paginate_button,
- .paginate_active{
- .rounded(5px);
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- .paginate_active{
- color : @color_split_active_text;
- background-color: @color_split_active;
- }
- }
-
- .top{
- padding: 1px 10px;
- .border-radius( 5px,0, 0, 5px);
-
- .dataTables_filter {
- clear: both;
- position: relative;
- right: 0;
- text-align: right;
- margin-bottom: 5px;
- }
- .dataTables_length {
- float: left;
- width: 40%;
- }
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
- }
-
- .bottom {
- padding: 5px 10px;
- .border-radius( 0, 5px, 5px, 0);
-
- .TableTools {
- margin: 0 0 5px 0;
- padding:0;
- height:34px;
- }
-
- .dataTables_length {
- float: left;
- width: 40%;
- }
-
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
-
- }
- }
-
- /**
- * class qui rend element enfant visible au survol de l'element parent
- */
- .view.fils {display:none}
- .dataTableBase tr:hover .view.fils,
- .dataTable tr:hover .view.fils,
- .dataTableRow.Selected .view.fils,
- .view.parent:hover .view.fils{display:block;height:13px}
-
-
-
-
- /**
- * Listing Filter for Datatable
- */
- div#central form#filters {
- padding:0;
- margin: 0 1em;
- width:98%;
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- .border-radius( 5px, 5px, 5px, 5px);
- .rounded(5px);
-
- p.Ctrtirroir {
- padding: 2px 10px 2px 20px;
- font-size:(@font_size*1.2);
- width:95.2%;
- color: #000000;
- font-weight: bold;
-
- &:hover {
- background-color: @bg_hover;
- cursor:pointer;
- }
- }
-
- div#filtre {
- padding:0;
- border:1px solid #AAAAAA;
- background: transparent;
-
- ul.ui-tabs-nav {
- width:99.6%;
-
- li{
- line-height:1em;
- width:auto;
- }
- }
- }
-
- fieldset label{width:auto;}
-
- li.select{
- color : @color_tab_text_selected ;
- }
- }
-
-
-
- /**
- * Forms
- */
- fieldset {
- margin: 0.3em ;
- padding:0.3em;
- border:none;
-
- p {
- margin: 0.3em;
- padding:0.3em;
- }
-
- select,
- input[type="text"] { min-width:62%; display:inline-block;}
-
- select option {display:block; float:none;clear:both;width:100%}
-
- label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
-
- ul{
- list-style:none;
- .rounded(5px);
- }
- // Cat list lors edition article ou cms
- ul.LinkToView{
- overflow: auto;
- max-height: 160px;
- background-color: #fff;
- padding: 5px;
- line-height: 15px;
- border: 1px solid #666;
- }
- }
-
- input.radioInput {width:30px;}
-
- div#form_bt { width: 80%; margin: 1em 2em;}
- ul.form_radio_inline{display:inline-block;}
- .noselected{}
- .selected{background:#f0d4bf;}
- .color_type {display: inline-block; padding: 6px 0 6px 5px;background: none repeat scroll 0 0 transparent;}
-
-
- // master central display
- div#central form{
- padding:0.5em 1em;
-
- label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
-
- fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
-
- textarea{ vertical-align:baseline;}
-
- p{
-
- input[type="checkbox"] { float:right; }
-
- select,
- input[type="text"] {
- margin:5px 15px;
- }
- select{
- padding:1px 0 0 0;
- height:(@lineheight * 1.3);
- line-height:(@lineheight * 1.3);
- }
- }
- p.new_product_img {
- float:left;
- padding:5px;
- margin : 0 auto;
- text-align:center;
- width:98%;
- border:1px solid @color_012;
- .border-radius(5px,5px,5px,5px);
-
- img{
- margin:auto;
- max-width: 300px;
- }
- }
-
-
- ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
-
- .block_form {
- .block_input{
- text-shadow:0 1px 0 #fff;
- width:94.9%;
- margin:2px 1px;
- display:inline-block;
- text-align: left;
- background:#C9C9C9;
- float:left;
- line-height:18px;
- padding:5px 5px 10px 5px;
- border:1px solid @color_014;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
-
-
- span.value_edit {clear:both;display:inline-block; width:100%;}
-
- br,
- span.value_edit br{display:none;}
-
- label br {display:inline-block;}
-
- span.edit-input,
- span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
-
- span.edit-input{
- white-space:nowrap;
-
- input{float: left;}
-
- .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
- .edit-input-value {padding-left:12px;}
- /* remplacement true /false par icone */
- .edit-input-value.Val-true ,
- .edit-input-value.Val-false {font-size:0;}
- .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
- .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
- }
- }
-
- .block_input.tirroir {float:none;}
-
- .tabs_lang{width:98.5%; float:left;}
- }
-
- .block_field {
- text-shadow:0 1px 0 #fff;
- width:98.9%; margin:2px ;
- display:inline-block;
- text-align: left;
- padding: 5px;
- float:left;
-
- .tabs,
- .tabs_lang{
- width:96.5%;
- margin:0 2px ;
- display:inline-block;
- text-align: left;
- padding:0 5px;
- float:left;
- }
-
- .tabs_lang ul.ui-tabs-nav,
- .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
- }
-
- .block_input label.inline { white-space:nowrap; width: 20%;}
-
- .edit.col_right .block_input{
- width:95%;
-
- label{width:20%;text-align:left;font-weight:bold}
- }
-
- .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
-
- .input-multi input[type="checkbox"],
- .input-multi input[type="radio"]{float:none;}
-
-
- }
-
- div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
-
- /* Select Categorie */
- div#central #CurrentPathSelect *,
- div#central #CurrentPathSelect form {
- margin:@margin 0;
- padding:0;
- width:100%;
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- select#cPath {
- margin:0;
- font-size:(@font_size * 1.3);
- color:black;
- font-weight:bold;
- padding:0.2em 0.6em;
- height: (@lineheight * 1.8) ;
-
- &:hover {background-color: @bg_hover;cursor:pointer; }
-
- option {
- margin:0;
- background-color:#f5f5f5;
- }
- }
- }
-
-
- /**
- * Section specific Orders page
- */
- .main-orders{
- fieldset{
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- .box_uniq.block_form{
- fieldset{
- margin:1% 2%;
- padding:0 1%;
- }
-
- .w_50 {
- width:44%;
- }
- }
-
- block_input{
- br,
- span.value_edit br{display:block;height:0;}
- }
-
- table.main-orders {
- margin:1%;
- width:98%;
-
- thead tr th{
- background:@color_013;
- color:@color_011;
- font-weight: normal;
- text-shadow: none;
- }
-
- tr th{
- margin:0;
- background:#eee;
- height:(@lineheight * 1.3);
- line-height:(@lineheight * 0.5);
- }
- }
-
- .block {
- width: 46%;
- margin:@margin (@margin / 2);
- background:#c9c9c9;
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- }
- }
-
- /* Ajsutement customer page */
- div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
-
-
- /**
- * External - plugin - others
- */
- div#fancybox-outer {
- background:none;
- border:none !important;
-
- div#fancybox-content {
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- .border-radius(0,5px,5px,0);
-
- h3{
- color:@color_title_txt;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
- .border-radius(5px,0,0,5px);
- }
- }
- }
- /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
- div#fancybox-inner{
- h3 {
- color:@color_title_txt;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
- .border-radius(5px,0,0,5px);
- }
-
- form {
- float:left;
- position: relative;
- top:20px;
- padding: 0 0 30px;
- margin:0 0 30px 0;
-
- h3{ top: -25px;}
-
- fieldset {
- margin: 5px;
- padding:5pxem;
- border:none;
-
- label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
-
- select,
- input[type="text"] { min-width:65%; display:inline-block;float:right;}
-
- .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
- }
- }
- }
- // UI
- /* Layout helpers */
- .ui-dialog {
- .ui-widget-header{
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
- .border-radius(5px,0,0,5px);
- }
- .ui-dialog-content{
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
- .border-radius(0,5px,5px,0);
- }
- }
-
- .ui-helper-hidden { display: none; }
- .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
- .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
- .ui-helper-clearfix {
- zoom: 1;
-
- &:before,
- &:after { content: ""; display: table; }
- &:after { clear: both; }
- }
- .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
- /* Interaction states */
- .ui-state-default,
- .ui-widget-content .ui-state-default,
- .ui-widget-header .ui-state-default {
- font-weight: normal;
- color: @color_tab_text_default;
- text-shadow : 0 1px 0 @color_tab_text_default_shadow;
- border-bottom:2px solid @color_tabs_cl_1;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_default;
- text-decoration: none;
- text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
- }
- }
-
- .ui-state-hover,
- .ui-widget-content .ui-state-hover,
- .ui-widget-header .ui-state-hover,
- .ui-state-focus,
- .ui-widget-content .ui-state-focus,
- .ui-widget-header .ui-state-focus {
- border-bottom:2px solid @color_tabs_cl_1;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
- font-weight: normal;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_hover;
- text-decoration: none;
- text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
- }
- }
-
- .ui-state-hover a,
- .ui-state-hover a:hover {
- color: @color_tab_text_selected;
- text-decoration: none;
-
- }
-
- .ui-state-active,
- .ui-widget-content .ui-state-active,
- .ui-widget-header .ui-state-active {
- border: 1px solid (@color_bg_gradient_base - 50);
- .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
- font-weight: normal;
- color: @color_tab_text_selected;
- border-bottom: 0 !important;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_selected;
- text-decoration: none;
- }
- }
-
-
- .ui-widget :active { outline: none; }
-
- // UI generic
- .ui-widget {
- font-family: Verdana,Arial,sans-serif;
- font-size: (@font_size * 1.1);
-
- .ui-widget { font-size: @font_size; }
-
- }
-
-
- .ui-widget-header {
- border-radius: 0;
- border-bottom: 1px solid #aaaaaa;
- font-weight: bold;
- }
-
-
-
- // UI tabs
- .ui-tabs {
- position: relative;
- padding: .2em;
- zoom: 1;
-
- .ui-tabs-nav {
- margin: 0;
- padding: 0;
-
- li {
- list-style: none;
- float: left;
- position: relative;
- top: 1px;
- margin: 0 .1em 0 0;
- padding: 0;
- white-space: nowrap;
-
- a {
- float: left;
- padding: .3em 0.5em;
- text-decoration: none;
- cursor: pointer;
- font-size: (@font_size*1.3);
- font-weight : bold;
- }
- }
-
- .ui-tabs-selected {
- margin-bottom: 0;
- padding-bottom: 1px;
- cursor: not-drop;
- }
- .ui-tabs-selected,
- .ui-tabs-selected a,
- .ui-state-disabled a,
- .ui-state-processing a {
- cursor: not-allowed !important;
- text-shadow : 0 1px 0 @color_tab_text_selected_shadow;
- }
- }
-
- .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
-
- .ui-tabs-panel { display: block; border-width: 0; padding: (@padding_base * 0.1); background: none; }
-
- .ui-tabs-hide { display: none !important; }
-
- div.box_uniq { width:99%; }
- }
-
-
-
-
-
-
-
- // Toolips
- .tooltip{
- position:absolute;
- z-index:999;
- left:-9999px;
- background-color:#dedede;
- padding:5px;
- border:1px solid #fff;
- width:250px;
-
- p{
- margin:0;
- padding:0;
- color:#fff;
- background-color:#222;
- padding:(@padding_base * 0.1) (@padding_base * 0.5);
- }
- }
-
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 16:15:18
|
Revision: 4562
http://oscss.svn.sourceforge.net/oscss/?rev=4562&view=rev
Author: oscim
Date: 2012-08-04 16:15:12 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suite correction
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 15:20:12 UTC (rev 4561)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 16:15:12 UTC (rev 4562)
@@ -487,8 +487,8 @@
*/
div#central form#filters {
padding:0;
- margin: 0 1em;
- width:98%;
+ margin: 1em 0 ;
+ width:100%;
.bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
.box-shadow(2px 5px 3px rgba(0,0,0,0.5));
.border-radius( 5px, 5px, 5px, 5px);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 15:20:18
|
Revision: 4561
http://oscss.svn.sourceforge.net/oscss/?rev=4561&view=rev
Author: oscim
Date: 2012-08-04 15:20:12 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less
Added: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/header.less 2012-08-04 15:20:12 UTC (rev 4561)
@@ -0,0 +1,235 @@
+/**
+*/
+
+header#header {
+ background:@header_base_bg;
+ min-width:@display_max_width;
+ width:@display_width ;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:@header_sub_height;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:@color_011;
+ background:@header_info_bg;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:@header_sub_height;}
+ h2 {display:inline; line-height:@header_sub_height; color:#FFFFFF; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:@color_011; text-decoration:none; line-height:@header_sub_height; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+}
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ margin-top:(@margin * 0.05);
+ background:transparent ;
+ height:(@lineheight * 1.55);
+
+
+ a,
+ a:link,
+ a:visited {
+ color: @nav_master_link;
+ text-decoration: none;
+ text-shadow:none;
+ }
+
+ a {
+ display:block;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal @font_size Verdana, Arial, sans-serif;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+
+ &:link,
+ &:visited {
+ color:@nav_master_link;
+ }
+
+ &:hover {
+ color:@nav_master_link_hover;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color: @submenu_link;
+ padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+ text-align:left;
+
+ &:hover {
+ background-color:@submenu_bg_hover;
+ color:@submenu_link_hover ;
+ text-shadow: 0 1px 0 @submenu_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:@submenu_bg;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul { display:block; }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+ }
+
+ ul{
+// background : @header_info_bg;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+ .gradient( @header_info_bg, @header_info_bg , (@header_info_bg + #FFF )) ;
+ }
+
+ ul.fleft{
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+ form{
+ margin:0;
+ padding:0;
+ }
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:@color_011;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+
+ option{
+ display:block;
+ color:@color_013;
+ font-size:(@font_size *0.9);
+ }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ margin-top:(@margin * 0.05);
+ background:@menu_user_bg ;
+ padding-right:10px;
+ height:@header_sub_height;
+
+
+ ul#MenuExts{
+ display:block;
+ height: @header_sub_height;
+ float:left;
+
+ li{
+ position:relative;
+ float:left;
+
+ height: @header_sub_height;
+ padding: 0 8px;
+ margin:0 1px;
+// background: none repeat-x scroll 0 0 @color_bg_menuexts;
+ border:none;
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+ .gradient( @color_bg_menuexts, @color_bg_menuexts , (@color_bg_menuexts + #FFF )) ;
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:( @lineheight * 1.3);
+ text-align:center;
+ color:@color_011;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+
+
+}
+
+
+
+/* Specifique menu */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 15:19:42
|
Revision: 4560
http://oscss.svn.sourceforge.net/oscss/?rev=4560&view=rev
Author: oscim
Date: 2012-08-04 15:19:35 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suite fragementation des fichier less des theme du bo pour simplifier la gestion / maintenance
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
Added: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/datatable.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -0,0 +1,206 @@
+/**
+ */
+
+/**
+ * Dipslay all listing in array
+ */
+.dataTableBase,
+.dataTableSearch,
+.dataTable{
+ width:100%;
+ border-width:0;
+ border:1px solid @color_012;
+ .rounded(5px);
+
+ a.button,
+ input[type=submit].button,
+ input[type=image].button,
+ button.button {
+ margin:0;
+ }
+
+
+ tr {
+ padding:0;
+ margin:0;
+
+ th{
+ background-color: @color_datatable_tr_th;
+ font-size:@font_size;
+ font-weight:bold;
+ text-align:center;
+ color: @color_datatable_tr_th_txt;
+ text-shadow:none;
+ min-height:( @lineheight * 1.6 );
+ height:( @lineheight * 1.6 );
+ }
+ }
+
+
+ tbody{
+
+ // rollover rows for mouse
+ tr,
+ tr.odd,
+ tr.even{
+ border:none;
+ cursor:default;
+
+ &:hover{
+ background-color: @bg_hover;
+ cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
+ }
+
+ td{
+ line-height:( @lineheight * 1.1 );
+ color: @datatable_color_txt;
+ padding: 2px;
+ font-size: @font_size;
+ cursor:default;
+
+ a{
+ text-decoration:none;
+ color: @datatable_color_txt;
+ }
+
+ /* Replace value by icon */
+ .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+
+ .edit-input-value .Flag-0.txt,
+ .edit-input-value .Val-0.txt { display:none}
+ .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
+ .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
+
+ .edit-input-value .Flag-1.txt,
+ .edit-input-value .Val-1.txt { display:none}
+ .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
+ .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
+ }
+ .row_action {
+ min-width:100px;
+ text-align:right;
+ }
+
+ .row_action_large {
+ min-width:250px;
+ text-align:right;
+ }
+
+ .row_customers {
+ min-width:100px;
+ text-align:left;
+ }
+
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
+ }
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
+ }
+
+ .sorting_2{
+ background-color:( @color_sorting + 65);
+ }
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 65);
+ }
+
+ .sorting_3{
+ background-color:( @color_sorting + 80);
+ }
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 80);
+ }
+
+
+ }
+
+ .odd{
+ background-color: @bg_table_tr_odd;
+ }
+
+ .even{
+ background-color: @bg_table_tr_even;
+ }
+ }
+
+ tfoot tr td input {width:80%;text-align:left;}
+}
+
+
+.dataTables_wrapper {
+ min-height:200px;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .paging_full_numbers{
+
+ .paginate_button,
+ .paginate_active{
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .paginate_active{
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
+ }
+
+ .top{
+ padding: 1px 10px;
+ .border-radius( 5px,0, 0, 5px);
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ margin-bottom: 5px;
+ }
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+ }
+
+ .bottom {
+ padding: 5px 10px;
+ .border-radius( 0, 5px, 5px, 0);
+
+ .TableTools {
+ margin: 0 0 5px 0;
+ padding:0;
+ height:34px;
+ }
+
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ }
+}
\ No newline at end of file
Added: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/forms.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -0,0 +1,206 @@
+/**
+ */
+
+ /**
+ * Dipslay all listing in array
+ */
+ .dataTableBase,
+ .dataTableSearch,
+ .dataTable{
+ width:100%;
+ border-width:0;
+ border:1px solid @color_012;
+ .rounded(5px);
+
+ a.button,
+ input[type=submit].button,
+ input[type=image].button,
+ button.button {
+ margin:0;
+ }
+
+
+ tr {
+ padding:0;
+ margin:0;
+
+ th{
+ background-color: @color_datatable_tr_th;
+ font-size:@font_size;
+ font-weight:bold;
+ text-align:center;
+ color: @color_datatable_tr_th_txt;
+ text-shadow:none;
+ min-height:( @lineheight * 1.6 );
+ height:( @lineheight * 1.6 );
+ }
+ }
+
+
+ tbody{
+
+ // rollover rows for mouse
+ tr,
+ tr.odd,
+ tr.even{
+ border:none;
+ cursor:default;
+
+ &:hover{
+ background-color: @bg_hover;
+ cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
+ }
+
+ td{
+ line-height:( @lineheight * 1.1 );
+ color: @datatable_color_txt;
+ padding: 2px;
+ font-size: @font_size;
+ cursor:default;
+
+ a{
+ text-decoration:none;
+ color: @datatable_color_txt;
+ }
+
+ /* Replace value by icon */
+ .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+
+ .edit-input-value .Flag-0.txt,
+ .edit-input-value .Val-0.txt { display:none}
+ .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
+ .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
+
+ .edit-input-value .Flag-1.txt,
+ .edit-input-value .Val-1.txt { display:none}
+ .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
+ .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
+ }
+ .row_action {
+ min-width:100px;
+ text-align:right;
+ }
+
+ .row_action_large {
+ min-width:250px;
+ text-align:right;
+ }
+
+ .row_customers {
+ min-width:100px;
+ text-align:left;
+ }
+
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
+ }
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
+ }
+
+ .sorting_2{
+ background-color:( @color_sorting + 65);
+ }
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 65);
+ }
+
+ .sorting_3{
+ background-color:( @color_sorting + 80);
+ }
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 80);
+ }
+
+
+ }
+
+ .odd{
+ background-color: @bg_table_tr_odd;
+ }
+
+ .even{
+ background-color: @bg_table_tr_even;
+ }
+ }
+
+ tfoot tr td input {width:80%;text-align:left;}
+ }
+
+
+ .dataTables_wrapper {
+ min-height:200px;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .paging_full_numbers{
+
+ .paginate_button,
+ .paginate_active{
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .paginate_active{
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
+ }
+
+ .top{
+ padding: 1px 10px;
+ .border-radius( 5px,0, 0, 5px);
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ margin-bottom: 5px;
+ }
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+ }
+
+ .bottom {
+ padding: 5px 10px;
+ .border-radius( 0, 5px, 5px, 0);
+
+ .TableTools {
+ margin: 0 0 5px 0;
+ padding:0;
+ height:34px;
+ }
+
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ }
+ }
\ No newline at end of file
Copied: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less (from rev 4557, branches/2.1.1/catalog/admin/includes/template/defaut/styles.less)
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/styles.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -0,0 +1,902 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* Mixin */
+
+.wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+}
+
+/**
+ * Reto-compatibilte oscommerce oscss < 2.xx
+ */
+/* info box block droit */
+.infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+}
+.infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+}
+.infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+/* Generalite */
+
+
+*{
+ margin:0;
+ padding:0;
+ text-shadow:none;
+ border:0;
+}
+a :link,
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border:0 ; margin:0; padding:0; }
+h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
+h2 { font-size:(@font_size * 1.2) ;}
+h3 {
+ clear:both;
+ color: @title_h3_color;
+ font-size: (@font_size * 1.9);
+ font-weight: bold;
+ padding: @padding_base 0 @padding_base (@padding_base * 1.2);
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
+}
+h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+th {
+ margin:2px 1px;
+ text-align: left;
+ padding: 2px @padding_base;
+ height:@lineheight;
+ line-height:(@lineheight * 0.7);
+}
+
+
+
+
+/* general class */
+.error{ color:@field_required; }
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline ,
+.inline *,
+div#central .inline *{ display:inline-block; }
+.nobr {white-space:nowrap;}
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
+.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
+.linkdoc {font-size:@font_size; font-weight:bold; }
+.spacer,
+.separator{clear:both;}
+.fieldRequired { color: @field_required; }
+.smallText { font-size: (@font_size * 0.8); }
+.errorText { color: @field_required; }
+
+
+/* --- message box --- */
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:(@padding_base * 0.2);}
+.messageStackError,
+.messageStackWarning { background:@color_warning;}
+.messageStackSuccess { background:@color_success; }
+.messageStackNotice { background:@color_notice;}
+
+/* toogle item complet js action */
+h4.Ctrtirroir,
+h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 (@padding_base * 2); font-size: (@font_size * 1.1); }
+.Ctrtirroir {
+ background:transparent url("../../../../../images/icons/icon_down.gif") left top no-repeat;
+ padding-left:(@padding_base * 2);
+ height:@lineheight;
+}
+.Ctrtirroir.closed {background:transparent url("../../../../../images/icons/icon_arrow_right.gif") left top no-repeat; }
+fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
+
+
+
+
+
+
+
+
+
+
+
+body {
+ background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background-attachment:fixed;
+ font: normal @font_size Verdana, Arial, sans-serif;
+}
+
+
+/**
+ * Structure base html
+ * no specific forms (cf section forms )
+ */
+
+.configuration{
+ div#central{
+
+ div#ssmenu{
+ display: block;
+ height: ( @lineheight * 1.5);
+ line-height: ( @lineheight * 1.5);
+ padding: 5px 10px;
+ width: 100%;
+ }
+
+ div.box_right {
+ right:0;
+ width:39%;
+
+ ul{ list-style:none; }
+ }
+ }
+}
+
+// .page {
+ // div#central{
+ // }
+ // }
+
+ div#glob {
+ width:100%;
+ z-index:10;
+ height:100%;
+
+
+
+ div#central{
+ position:relative;
+ padding:10px 5px;
+ top:79px;
+ margin-bottom: 79px;
+// border-left: 1px solid black;
+// border-right: 1px solid black;
+// border-bottom: 1px solid black;
+ background:@color_011;
+
+ div.box_uniq {
+ width:100%;
+ float:left;
+ padding: 0;
+ background:none;
+ }
+
+ div.box_left { width:60%; float:left; }
+
+ div.box_right {
+ width:39%;
+ float:right;
+ }
+
+ h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ }
+
+ }
+
+ div#center,
+ div#bas {
+ margin: 0 auto;
+ position: relative;
+ min-width:@display_max_width;
+ width:@display_width ;
+ }
+
+ div#bas {
+ // margin-top:8em;
+ clear:both;
+ height:25px;
+ background:@bas_bg;
+ color:@bas_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ text-shadow : none;
+ padding: 4px 25px;
+ color:(@bas_bg_txt + #015);
+ }
+
+ }
+ footer {
+ background: @footer_bg;
+ clear:both;width:100%;
+ text-align:center;
+ color:@footer_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ color: (@footer_bg_txt + #015);
+ text-decoration: none;
+
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+
+
+
+
+ /**
+ * Bouton
+ */
+ .button,
+ select.button,
+ input[type=submit].button,
+ input[type=button].button,
+ button.button,
+ a.button{
+ display: inline-block;
+ font-family:Arial;
+ white-space:nowrap;
+ float:right;
+ color:@color_011;
+ vertical-align:middle;
+ border:1px solid #fff;
+ height: ( @lineheight * 1.6);
+ line-height: 25px;
+ margin:8px 20px;
+ text-shadow: none;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+ input[type=image].button {
+ float:left;
+ height:( @lineheight * 1.3);
+ width:18px;
+ }
+
+ input.button,
+ button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
+
+
+ a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none; height:( @lineheight * 1.3) ; line-height:( @lineheight * 1.3);}
+ a.button:hover{color:@color_011;text-decoration:none; }
+
+ a.button,
+ select.button,
+ input.button,
+ button.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
+ }
+
+ a.button.ActionYes,
+ input.button.ActionYes,
+ input[type=image].button.ActionYes,
+ input[type=submit].button.ActionYes,
+ button.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
+ }
+
+ a.button.ActionBack,
+ input[type=image].button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+
+ input:hover.button,
+ button:hover.button{background:#797979;color:@color_011;}
+
+ a:hover.button,
+ input:hover.button,
+ button:hover.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
+ opacity:0.6;
+ }
+
+ a:hover.button.ActionYes,
+ input:hover.button.ActionYes,
+ button:hover.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
+ color:black;
+ }
+
+ a.button.ActionBack,
+ input.button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
+ }
+
+ a:hover.button.ActionBack,
+ input:hover.button.ActionBack,
+ button:hover.button.ActionBack {
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+ input[type=image].button,
+ a.buttonimg img{ opacity:1;}
+
+ input[type=image]:hover.button ,
+ a:hover.buttonimg img,
+ a.buttonimg img:hover{ opacity:0.6;}
+
+ /* Spe buttons broswer img */
+ a.button.browser {height:24px;}
+ a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+ .row_action a.button {margin:0;}
+
+
+ /* Block html content all bouton */
+ .button_nav{
+ clear:both;
+
+ form{
+ float:right;
+ width:100px;
+
+ p {margin:0;padding:0;}
+ }
+ }
+
+
+ /**
+ * Section for block widget in dashbord
+ */
+ .widget{
+ float: left;
+ margin: @margin ( @margin *0.5);
+ width: (100% - (@margin * 1) );
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ h3 {
+ color: @color_widget_title;
+ clear: both;
+ margin-bottom:@margin;
+ padding:5px 0 5px 5px;
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+
+ a{
+ color: @color_widget_title;
+ text-decoration:none;
+
+ &:hover{
+ color: gray;
+ }
+ }
+ }
+
+ ol {padding-left:25px;}
+
+ .dataTableBase tr{
+ background-color: #F0F0F0;
+
+ th {
+ height: 20px;
+ line-height: 20px;
+ background : @color_widget_bg_th;
+ }
+
+ &:nth-child(odd) {
+ background-color: #D7D7D7;
+ }
+
+ a{
+ font-weight : bold;
+ color: @color_widget_bg_th;
+ }
+ }
+
+
+ /* sous menu en widget , specifique page conf et dashboard configuration */
+ div#ssmenu{
+ a {
+ background: none repeat scroll 0 0 #797979;
+ border-right: 1px solid #444444;
+ clear: both;
+ color: @color_011;
+ font-size: @font_size;
+ margin: 0 0 1px 25px;
+ padding: 5px 10px;
+ text-shadow: 0 1px 0 #000000;
+ width: 40%;
+
+ &:hover {
+ float:left;
+ margin:0;
+ background:#eee;
+ color:#000;
+ text-shadow: 0 1px 0 #fff;
+ }
+ }
+ }
+ }
+
+
+ .edit{
+ background:#eee;
+ background-attachment:none;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+
+
+
+ /**
+ * class qui rend element enfant visible au survol de l'element parent
+ */
+ .view.fils {display:none}
+ .dataTableBase tr:hover .view.fils,
+ .dataTable tr:hover .view.fils,
+ .dataTableRow.Selected .view.fils,
+ .view.parent:hover .view.fils{display:block;height:13px}
+
+
+
+
+ /**
+ * Listing Filter for Datatable
+ */
+ div#central form#filters {
+ padding:0;
+ margin: 0 1em;
+ width:98%;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ p.Ctrtirroir {
+ padding: 2px 10px 2px 20px;
+ font-size:(@font_size*1.2);
+ width:95.2%;
+ color: #000000;
+ font-weight: bold;
+
+ &:hover {
+ background-color: @bg_hover;
+ cursor:pointer;
+ }
+ }
+
+ div#filtre {
+ padding:0;
+ border:1px solid #AAAAAA;
+ background: transparent;
+
+ ul.ui-tabs-nav {
+ width:99.6%;
+
+ li{
+ line-height:1em;
+ width:auto;
+ }
+ }
+ }
+
+ fieldset label{width:auto;}
+
+ li.select{
+ color : @color_tab_text_selected ;
+ }
+ }
+
+
+
+ /**
+ * Forms
+ */
+ fieldset {
+ margin: 0.3em ;
+ padding:0.3em;
+ border:none;
+
+ p {
+ margin: 0.3em;
+ padding:0.3em;
+ }
+
+ select,
+ input[type="text"] { min-width:62%; display:inline-block;}
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ input.radioInput {width:30px;}
+
+ div#form_bt { width: 80%; margin: 1em 2em;}
+ ul.form_radio_inline{display:inline-block;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
+ .color_type {display: inline-block; padding: 6px 0 6px 5px;background: none repeat scroll 0 0 transparent;}
+
+
+
+ div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+
+ /* Select Categorie */
+ div#central #CurrentPathSelect *,
+ div#central #CurrentPathSelect form {
+ margin:@margin 0;
+ padding:0;
+ width:100%;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ select#cPath {
+ margin:0;
+ font-size:(@font_size * 1.3);
+ color:black;
+ font-weight:bold;
+ padding:0.2em 0.6em;
+ height: (@lineheight * 1.8) ;
+
+ &:hover {background-color: @bg_hover;cursor:pointer; }
+
+ option {
+ margin:0;
+ background-color:#f5f5f5;
+ }
+ }
+ }
+
+
+ /**
+ * Section specific Orders page
+ */
+ .main-orders{
+ fieldset{
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .box_uniq.block_form{
+ fieldset{
+ margin:1% 2%;
+ padding:0 1%;
+ }
+
+ .w_50 {
+ width:44%;
+ }
+ }
+
+ block_input{
+ br,
+ span.value_edit br{display:block;height:0;}
+ }
+
+ table.main-orders {
+ margin:1%;
+ width:98%;
+
+ thead tr th{
+ background:@color_013;
+ color:@color_011;
+ font-weight: normal;
+ text-shadow: none;
+ }
+
+ tr th{
+ margin:0;
+ background:#eee;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 0.5);
+ }
+ }
+
+ .block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ }
+ }
+
+ /* Ajsutement customer page */
+ div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+
+
+ /**
+ * External - plugin - others
+ */
+ div#fancybox-outer {
+ background:none;
+ border:none !important;
+
+ div#fancybox-content {
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+
+ h3{
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ }
+ }
+ /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
+ div#fancybox-inner{
+ h3 {
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+
+ form {
+ float:left;
+ position: relative;
+ top:20px;
+ padding: 0 0 30px;
+ margin:0 0 30px 0;
+
+ h3{ top: -25px;}
+
+ fieldset {
+ margin: 5px;
+ padding:5pxem;
+ border:none;
+
+ label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
+
+ select,
+ input[type="text"] { min-width:65%; display:inline-block;float:right;}
+
+ .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
+ }
+ }
+ }
+ // UI
+ /* Layout helpers */
+ .ui-dialog {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-dialog-content{
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
+ .ui-helper-hidden { display: none; }
+ .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
+ .ui-helper-clearfix {
+ zoom: 1;
+
+ &:before,
+ &:after { content: ""; display: table; }
+ &:after { clear: both; }
+ }
+ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+ /* Interaction states */
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ font-weight: normal;
+ color: @color_tab_text_default;
+ text-shadow : 0 1px 0 @color_tab_text_default_shadow;
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover,
+ .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
+ font-weight: normal;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_hover;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover a,
+ .ui-state-hover a:hover {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: 1px solid (@color_bg_gradient_base - 50);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ font-weight: normal;
+ color: @color_tab_text_selected;
+ border-bottom: 0 !important;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+ }
+ }
+
+
+ .ui-widget :active { outline: none; }
+
+ // UI generic
+ .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size * 1.1);
+
+ .ui-widget { font-size: @font_size; }
+
+ }
+
+
+ .ui-widget-header {
+ border-radius: 0;
+ border-bottom: 1px solid #aaaaaa;
+ font-weight: bold;
+ }
+
+
+
+ // UI tabs
+ .ui-tabs {
+ position: relative;
+ padding: .2em;
+ zoom: 1;
+
+ .ui-tabs-nav {
+ margin: 0;
+ padding: 0;
+
+ li {
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 1px;
+ margin: 0 .1em 0 0;
+ padding: 0;
+ white-space: nowrap;
+
+ a {
+ float: left;
+ padding: .3em 0.5em;
+ text-decoration: none;
+ cursor: pointer;
+ font-size: (@font_size*1.3);
+ font-weight : bold;
+ }
+ }
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ cursor: not-drop;
+ }
+ .ui-tabs-selected,
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a {
+ cursor: not-allowed !important;
+ text-shadow : 0 1px 0 @color_tab_text_selected_shadow;
+ }
+ }
+
+ .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
+
+ .ui-tabs-panel { display: block; border-width: 0; padding: (@padding_base * 0.1); background: none; }
+
+ .ui-tabs-hide { display: none !important; }
+
+ div.box_uniq { width:99%; }
+ }
+
+
+
+
+
+
+
+ // Toolips
+ .tooltip{
+ position:absolute;
+ z-index:999;
+ left:-9999px;
+ background-color:#dedede;
+ padding:5px;
+ border:1px solid #fff;
+ width:250px;
+
+ p{
+ margin:0;
+ padding:0;
+ color:#fff;
+ background-color:#222;
+ padding:(@padding_base * 0.1) (@padding_base * 0.5);
+ }
+ }
+
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 14:56:02 UTC (rev 4559)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -97,11 +97,11 @@
@color_tabs_cl_2 : @color_021 ;
@color_tabs_cl_3 : @color_022 ;
// tabs color text
- @color_tab_text_default : #ffffff;
- @color_tab_text_default_shadow : @color_011;
+ @color_tab_text_default : gray;
+ @color_tab_text_default_shadow : #000;
@color_tab_text_selected : @color_020;
@color_tab_text_selected_shadow : @color_011;
- @color_tab_text_hover : #ffffff;
+ @color_tab_text_hover : gray;
@color_tab_text_hover_shadow : #555555;
@@ -172,14 +172,24 @@
// POPUP
@color_title_txt : @color_011;
+
+// bas
+@bas_bg : @color_013 ;
+@bas_bg_txt : @color_011 ;
+// footer
+@footer_bg : transparent ;
+@footer_bg_txt : @color_015;
+
// Load generic element and style
@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/forms.less";
+@import "../defaut/css/less/datatable.less";
+
@import "../defaut/css/less/header.less";
+@import "../defaut/css/less/styles.less";
-@import "../defaut/styles.less";
-
body {
background:#e4e4e4 url(../../../images/back.jpg) repeat-x;
}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-04 14:56:02 UTC (rev 4559)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-04 15:19:35 UTC (rev 4560)
@@ -8,6 +8,10 @@
@encode UTF-8
*/
+/* logo link partenaires */
+#bas .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
/* MEnu ADmin Habillage iconne */
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less 2012-08-04 14:56:02 UTC (rev 4559)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -143,7 +143,11 @@
}
}
-
+ form{
+ margin:0;
+ padding:0;
+ }
+
/* Switcher */
p.themeSwitcher {
float:right;
Added: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/styles.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -0,0 +1,901 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* Mixin */
+
+.wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+}
+
+/**
+ * Reto-compatibilte oscommerce oscss < 2.xx
+ */
+/* info box block droit */
+.infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+}
+.infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+}
+.infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+/* Generalite */
+
+
+*{
+ margin:0;
+ padding:0;
+ text-shadow:none;
+ border:0;
+}
+a :link,
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border:0 ; margin:0; padding:0; }
+h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
+h2 { font-size:(@font_size * 1.2) ;}
+h3 {
+ clear:both;
+ color: @title_h3_color;
+ font-size: (@font_size * 1.9);
+ font-weight: bold;
+ padding: @padding_base 0 @padding_base (@padding_base * 1.2);
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
+}
+h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+th {
+ margin:2px 1px;
+ text-align: left;
+ padding: 2px @padding_base;
+ height:@lineheight;
+ line-height:(@lineheight * 0.7);
+}
+
+
+
+
+/* general class */
+.error{ color:@field_required; }
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline ,
+.inline *,
+div#central .inline *{ display:inline-block; }
+.nobr {white-space:nowrap;}
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
+.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
+.linkdoc {font-size:@font_size; font-weight:bold; }
+.spacer,
+.separator{clear:both;}
+.fieldRequired { color: @field_required; }
+.smallText { font-size: (@font_size * 0.8); }
+.errorText { color: @field_required; }
+
+
+/* --- message box --- */
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:(@padding_base * 0.2);}
+.messageStackError,
+.messageStackWarning { background:@color_warning;}
+.messageStackSuccess { background:@color_success; }
+.messageStackNotice { background:@color_notice;}
+
+/* toogle item complet js action */
+h4.Ctrtirroir,
+h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 (@padding_base * 2); font-size: (@font_size * 1.1); }
+.Ctrtirroir {
+ background:transparent url("../../../../../images/icons/icon_down.gif") left top no-repeat;
+ padding-left:(@padding_base * 2);
+ height:@lineheight;
+}
+.Ctrtirroir.closed {background:transparent url("../../../../../images/icons/icon_arrow_right.gif") left top no-repeat; }
+fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
+
+
+
+
+
+
+
+
+
+
+
+body {
+ background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background-attachment:fixed;
+ font: normal @font_size Verdana, Arial, sans-serif;
+}
+
+
+/**
+ * Structure base html
+ * no specific forms (cf section forms )
+ */
+
+.configuration{
+ div#central{
+
+ div#ssmenu{
+ display: block;
+ height: ( @lineheight * 1.5);
+ line-height: ( @lineheight * 1.5);
+ padding: 5px 10px;
+ width: 100%;
+ }
+
+ div.box_right {
+ right:0;
+ width:39%;
+
+ ul{ list-style:none; }
+ }
+ }
+}
+
+// .page {
+ // div#central{
+ // }
+ // }
+
+ div#glob {
+ width:100%;
+ z-index:10;
+ height:100%;
+
+
+
+ div#central{
+ position:relative;
+ padding:10px 5px;
+ top:79px;
+ margin-bottom: 79px;
+ border-left: 1px solid black;
+ border-right: 1px solid black;
+ border-bottom: 1px solid black;
+ background:@color_011;
+
+ div.box_uniq {
+ width:100%;
+ float:left;
+ padding: 0;
+ background:none;
+ }
+
+ div.box_left { width:60%; float:left; }
+
+ div.box_right {
+ width:39%;
+ float:right;
+ }
+
+ h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ }
+
+ }
+
+ div#center,
+ div#bas {
+ margin: 0 auto;
+ position: relative;
+ min-width:@display_max_width;
+ width:@display_width ;
+ }
+
+ div#bas {
+ // margin-top:8em;
+ clear:both;
+ height:25px;
+ background:@bas_bg;
+ color:@bas_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ text-shadow : none;
+ padding: 4px 25px;
+ color:@color_011;
+ }
+
+
+ }
+ footer {
+ background: @footer_bg;
+ clear:both;width:100%;
+ text-align:center;
+ color:@footer_bg_txt;
+
+ a,
+ a:link,
+ a:visited {
+ color:@color_011;
+ text-decoration: none;
+
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+
+
+
+
+ /**
+ * Bouton
+ */
+ .button,
+ select.button,
+ input[type=submit].button,
+ input[type=button].button,
+ button.button,
+ a.button{
+ display: inline-block;
+ font-family:Arial;
+ white-space:nowrap;
+ float:right;
+ color:@color_011;
+ vertical-align:middle;
+ border:1px solid #fff;
+ height: ( @lineheight * 1.6);
+ line-height: 25px;
+ margin:8px 20px;
+ text-shadow: none;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+ input[type=image].button {
+ float:left;
+ height:( @lineheight * 1.3);
+ width:18px;
+ }
+
+ input.button,
+ button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
+
+
+ a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none; height:( @lineheight * 1.3) ; line-height:( @lineheight * 1.3);}
+ a.button:hover{color:@color_011;text-decoration:none; }
+
+ a.button,
+ select.button,
+ input.button,
+ button.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
+ }
+
+ a.button.ActionYes,
+ input.button.ActionYes,
+ input[type=image].button.ActionYes,
+ input[type=submit].button.ActionYes,
+ button.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
+ }
+
+ a.button.ActionBack,
+ input[type=image].button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+
+ input:hover.button,
+ button:hover.button{background:#797979;color:@color_011;}
+
+ a:hover.button,
+ input:hover.button,
+ button:hover.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
+ opacity:0.6;
+ }
+
+ a:hover.button.ActionYes,
+ input:hover.button.ActionYes,
+ button:hover.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
+ color:black;
+ }
+
+ a.button.ActionBack,
+ input.button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
+ }
+
+ a:hover.button.ActionBack,
+ input:hover.button.ActionBack,
+ button:hover.button.ActionBack {
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+ input[type=image].button,
+ a.buttonimg img{ opacity:1;}
+
+ input[type=image]:hover.button ,
+ a:hover.buttonimg img,
+ a.buttonimg img:hover{ opacity:0.6;}
+
+ /* Spe buttons broswer img */
+ a.button.browser {height:24px;}
+ a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+ .row_action a.button {margin:0;}
+
+
+ /* Block html content all bouton */
+ .button_nav{
+ clear:both;
+
+ form{
+ float:right;
+ width:100px;
+
+ p {margin:0;padding:0;}
+ }
+ }
+
+
+ /**
+ * Section for block widget in dashbord
+ */
+ .widget{
+ float: left;
+ margin: @margin ( @margin *0.5);
+ width: (100% - (@margin * 1) );
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ h3 {
+ color: @color_widget_title;
+ clear: both;
+ margin-bottom:@margin;
+ padding:5px 0 5px 5px;
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+
+ a{
+ color: @color_widget_title;
+ text-decoration:none;
+
+ &:hover{
+ color: gray;
+ }
+ }
+ }
+
+ ol {padding-left:25px;}
+
+ .dataTableBase tr{
+ background-color: #F0F0F0;
+
+ th {
+ height: 20px;
+ line-height: 20px;
+ background : @color_widget_bg_th;
+ }
+
+ &:nth-child(odd) {
+ background-color: #D7D7D7;
+ }
+
+ a{
+ font-weight : bold;
+ color: @color_widget_bg_th;
+ }
+ }
+
+
+ /* sous menu en widget , specifique page conf et dashboard configuration */
+ div#ssmenu{
+ a {
+ background: none repeat scroll 0 0 #797979;
+ border-right: 1px solid #444444;
+ clear: both;
+ color: @color_011;
+ font-size: @font_size;
+ margin: 0 0 1px 25px;
+ padding: 5px 10px;
+ text-shadow: 0 1px 0 #000000;
+ width: 40%;
+
+ &:hover {
+ float:left;
+ margin:0;
+ background:#eee;
+ color:#000;
+ text-shadow: 0 1px 0 #fff;
+ }
+ }
+ }
+ }
+
+
+ .edit{
+ background:#eee;
+ background-attachment:none;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+
+ /**
+ * class qui rend element enfant visible au survol de l'element parent
+ */
+ .view.fils {display:none}
+ .dataTableBase tr:hover .view.fils,
+ .dataTable tr:hover .view.fils,
+ .dataTableRow.Selected .view.fils,
+ .view.parent:hover .view.fils{display:block;height:13px}
+
+
+
+
+ /**
+ * Listing Filter for Datatable
+ */
+ div#central form#filters {
+ padding:0;
+ margin: 1em 0 ;
+ width:100%;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ p.Ctrtirroir {
+ padding: 2px 10px 2px 20px;
+ font-size:(@font_size*1.2);
+ width:95.2%;
+ color: #000000;
+ font-weight: bold;
+
+ &:hover {
+ background-color: @bg_hover;
+ cursor:pointer;
+ }
+ }
+
+ div#filtre {
+ padding:0;
+ border:1px solid #AAAAAA;
+ background: transparent;
+
+ ul.ui-tabs-nav {
+ width:99.6%;
+
+ li{
+ line-height:1em;
+ width:auto;
+ }
+ }
+ }
+
+ fieldset label{width:auto;}
+
+ li.select{
+ color : @color_tab_text_selected ;
+ }
+ }
+
+
+
+ /**
+ * Forms
+ */
+ fieldset {
+ margin: 0.3em ;
+ padding:0.3em;
+ border:none;
+
+ p {
+ margin: 0.3em;
+ padding:0.3em;
+ }
+
+ select,
+ input[type="text"] { min-width:62%; display:inline-block;}
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ input.radioInput {width:30px;}
+
+ div#form_bt { width: 80%; margin: 1em 2em;}
+ ul.form_radio_inline{display:inline-block;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
+ .color_type {display: inline-block; padding: 6px 0 6px 5px;background: none repeat scroll 0 0 transparent;}
+
+
+
+ div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+
+ /* Select Categorie */
+ div#central #CurrentPathSelect *,
+ div#central #CurrentPathSelect form {
+ margin:@margin 0;
+ padding:0;
+ width:100%;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ select#cPath {
+ margin:0;
+ font-size:(@font_size * 1.3);
+ color:black;
+ font-weight:bold;
+ padding:0.2em 0.6em;
+ height: (@lineheight * 1.8) ;
+
+ &:hover {background-color: @bg_hover;cursor:pointer; }
+
+ option {
+ margin:0;
+ background-color:#f5f5f5;
+ }
+ }
+ }
+
+
+ /**
+ * Section specific Orders page
+ */
+ .main-orders{
+ fieldset{
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .box_uniq.block_form{
+ fieldset{
+ margin:1% 2%;
+ padding:0 1%;
+ }
+
+ .w_50 {
+ width:44%;
+ }
+ }
+
+ block_input{
+ br,
+ span.value_edit br{display:block;height:0;}
+ }
+
+ table.main-orders {
+ margin:1%;
+ width:98%;
+
+ thead tr th{
+ background:@color_013;
+ color:@color_011;
+ font-weight: normal;
+ text-shadow: none;
+ }
+
+ tr th{
+ margin:0;
+ background:#eee;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 0.5);
+ }
+ }
+
+ .block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ }
+ }
+
+ /* Ajsutement customer page */
+ div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+
+
+ /**
+ * External - plugin - others
+ */
+ div#fancybox-outer {
+ background:none;
+ border:none !important;
+
+ div#fancybox-content {
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+
+ h3{
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ }
+ }
+ /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
+ div#fancybox-inner{
+ h3 {
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+
+ form {
+ float:left;
+ position: relative;
+ top:20px;
+ padding: 0 0 30px;
+ margin:0 0 30px 0;
+
+ h3{ top: -25px;}
+
+ fieldset {
+ margin: 5px;
+ padding:5pxem;
+ border:none;
+
+ label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
+
+ select,
+ input[type="text"] { min-width:65%; display:inline-block;float:right;}
+
+ .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
+ }
+ }
+ }
+ // UI
+ /* Layout helpers */
+ .ui-dialog {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-dialog-content{
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
+ .ui-helper-hidden { display: none; }
+ .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
+ .ui-helper-clearfix {
+ zoom: 1;
+
+ &:before,
+ &:after { content: ""; display: table; }
+ &:after { clear: both; }
+ }
+ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+ /* Interaction states */
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ font-weight: normal;
+ color: @color_tab_text_default;
+ text-shadow : 0 1px 0 @color_tab_text_default_shadow;
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover,
+ .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
+ font-weight: normal;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_hover;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover a,
+ .ui-state-hover a:hover {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: 1px solid (@color_bg_gradient_base - 50);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ font-weight: normal;
+ color: @color_tab_text_selected;
+ border-bottom: 0 !important;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+ }
+ }
+
+
+ .ui-widget :active { outline: none; }
+
+ // UI generic
+ .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size * 1.1);
+
+ .ui-widget { font-size: @font_size; }
+
+ }
+
+
+ .ui-widget-header {
+ border-radius: 0;
+ border-bottom: 1px solid #aaaaaa;
+ font-weight: bold;
+ }
+
+
+
+ // UI tabs
+ .ui-tabs {
+ position: relative;
+ padding: .2em;
+ zoom: 1;
+
+ .ui-tabs-nav {
+ margin: 0;
+ padding: 0;
+
+ li {
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 1px;
+ margin: 0 .1em 0 0;
+ padding: 0;
+ white-space: nowrap;
+
+ a {
+ float: left;
+ padding: .3em 0.5em;
+ text-decoration: none;
+ cursor: pointer;
+ font-size: (@font_size*1.3);
+ font-weight : bold;
+ }
+ }
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ cursor: not-drop;
+ }
+ .ui-tabs-selected,
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a {
+ cursor: not-allowed !important;
+ text-shadow : 0 1px 0 @color_tab_text_selected_shadow;
+ }
+ }
+
+ .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
+
+ .ui-tabs-panel { display: block; border-width: 0; padding: (@padding_base * 0.1); background: none; }
+
+ .ui-tabs-hide { display: none !important; }
+
+ div.box_uniq { width:99%; }
+ }
+
+
+
+
+
+
+
+ // Toolips
+ .tooltip{
+ position:absolute;
+ z-index:999;
+ left:-9999px;
+ background-color:#dedede;
+ padding:5px;
+ border:1px solid #fff;
+ width:250px;
+
+ p{
+ margin:0;
+ padding:0;
+ color:#fff;
+ background-color:#222;
+ padding:(@padding_base * 0.1) (@padding_base * 0.5);
+ }
+ }
+
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 14:56:02 UTC (rev 4559)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 15:19:35 UTC (rev 4560)
@@ -169,10 +169,22 @@
// POPUP
@color_title_txt : @color_011;
+// bas
+@bas_bg : @color_013 ;
+@bas_bg_txt : @color_011 ;
+// footer
+@footer_bg : #505050 ;
+@footer_bg_txt : @color_011;
+
+
+
// Load generic element and style
@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/forms.less";
+@import "../defaut/css/less/datatable.less";
+
@import "css/less/header.less";
-@import "../defaut/styles.less";
+@import "css/less/styles.less";
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-08-04 14:56:02 UTC (rev 4559)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-08-04 15:19:35 UTC (rev 4560)
@@ -8,7 +8,12 @@
* @encode UTF-8
*/
+/* logo link partenaires */
+#bas .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+#bas .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
+
/* Structure */
div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
#menu_theme * {display:block;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 14:56:09
|
Revision: 4559
http://oscss.svn.sourceforge.net/oscss/?rev=4559&view=rev
Author: oscim
Date: 2012-08-04 14:56:02 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
suppression element obsolete
Removed Paths:
-------------
branches/2.1.1/catalog/admin/includes/template/oscss/element.less
branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
Deleted: branches/2.1.1/catalog/admin/includes/template/oscss/element.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/element.less 2012-08-04 14:20:21 UTC (rev 4558)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/element.less 2012-08-04 14:56:02 UTC (rev 4559)
@@ -1,136 +0,0 @@
-/*---------------------------------------------------
- * LESS Elements 0.6
- * ---------------------------------------------------
- * A set of useful LESS mixins by Dmitry Fadeyev
- * Special thanks for mixin suggestions to:
- * Kris Van Herzeele,
- * Benoit Adam,
- * Portenart Emile-Victor,
- * Ryan Faerman
- *
- * More info at: http://lesselements.com
- * -----------------------------------------------------*/
-
-.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
- background: @color;
- background: -webkit-gradient(linear,
- left bottom,
- left top,
- color-stop(0, @start),
- color-stop(1, @stop));
- background: -ms-linear-gradient(bottom,
- @start,
- @stop);
- background: -moz-linear-gradient(center bottom,
- @start 0%,
- @stop 100%);
-}
-.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
- background: @color;
- background: -webkit-gradient(linear,
- left bottom,
- left top,
- color-stop(0, rgb(@start,@start,@start)),
- color-stop(1, rgb(@stop,@stop,@stop)));
- background: -ms-linear-gradient(bottom,
- rgb(@start,@start,@start) 0%,
- rgb(@start,@start,@start) 100%);
- background: -moz-linear-gradient(center bottom,
- rgb(@start,@start,@start) 0%,
- rgb(@stop,@stop,@stop) 100%);
-}
-.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
- border-top: solid 1px @top-color;
- border-left: solid 1px @left-color;
- border-right: solid 1px @right-color;
- border-bottom: solid 1px @bottom-color;
-}
-.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
- -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
- -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
- box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
-}
-.rounded(@radius: 2px) {
- -webkit-border-radius: @radius;
- -moz-border-radius: @radius;
- border-radius: @radius;
- -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-}
-.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
- -webkit-border-top-right-radius: @topright;
- -webkit-border-bottom-right-radius: @bottomright;
- -webkit-border-bottom-left-radius: @bottomleft;
- -webkit-border-top-left-radius: @topleft;
- -moz-border-radius-topright: @topright;
- -moz-border-radius-bottomright: @bottomright;
- -moz-border-radius-bottomleft: @bottomleft;
- -moz-border-radius-topleft: @topleft;
- border-top-right-radius: @topright;
- border-bottom-right-radius: @bottomright;
- border-bottom-left-radius: @bottomleft;
- border-top-left-radius: @topleft;
- -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
-}
-.opacity(@opacity: 0.5) {
- -moz-opacity: @opacity;
- -khtml-opacity: @opacity;
- -webkit-opacity: @opacity;
- opacity: @opacity;
-}
-.transition-duration(@duration: 0.2s) {
- -moz-transition-duration: @duration;
- -webkit-transition-duration: @duration;
- transition-duration: @duration;
-}
-.rotation(@deg:5deg){
- -webkit-transform: rotate(@deg);
- -moz-transform: rotate(@deg);
- transform: rotate(@deg);
-}
-.scale(@ratio:1.5){
- -webkit-transform:scale(@ratio);
- -moz-transform:scale(@ratio);
- transform:scale(@ratio);
-}
-.transition(@duration:0.2s, @ease:ease-out) {
- -webkit-transition: all @duration @ease;
- -moz-transition: all @duration @ease;
- transition: all @duration @ease;
-}
-.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
- -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
- -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
- box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
-}
-.box-shadow(@arguments) {
- -webkit-box-shadow: @arguments;
- -moz-box-shadow: @arguments;
- box-shadow: @arguments;
-}
-.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
- -moz-column-width: @colwidth;
- -moz-column-count: @colcount;
- -moz-column-gap: @colgap;
- -moz-column-rule-color: @columnRuleColor;
- -moz-column-rule-style: @columnRuleStyle;
- -moz-column-rule-width: @columnRuleWidth;
- -webkit-column-width: @colwidth;
- -webkit-column-count: @colcount;
- -webkit-column-gap: @colgap;
- -webkit-column-rule-color: @columnRuleColor;
- -webkit-column-rule-style: @columnRuleStyle;
- -webkit-column-rule-width: @columnRuleWidth;
- column-width: @colwidth;
- column-count: @colcount;
- column-gap: @colgap;
- column-rule-color: @columnRuleColor;
- column-rule-style: @columnRuleStyle;
- column-rule-width: @columnRuleWidth;
-}
-.translate(@x:0, @y:0) {
- -moz-transform: translate(@x, @y);
- -webkit-transform: translate(@x, @y);
- -o-transform: translate(@x, @y);
- -ms-transform: translate(@x, @y);
- transform: translate(@x, @y);
-}
Deleted: branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/styles.less 2012-08-04 14:20:21 UTC (rev 4558)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/styles.less 2012-08-04 14:56:02 UTC (rev 4559)
@@ -1,1573 +0,0 @@
-/**
- * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
- * @portion code Copyright (c) 2002 osCommerce
- * @package osCSS-2 <www http://www.oscss.org>
- * @version 2.1.1
- * @date 01/01/2012, 18:17
- * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
- * @encode UTF-8
- */
-
-/* define color generic , used in next define */
- // color
- @color_010 : #78222F;
- @color_011 : #FFFFFF;
- @color_012 : #ACAAAC;
-
- // gardient red
- @color_020 : #AE0405 ;
- @color_021 : #AE0405 ;
- @color_022 : #FD3841 ;
-
-
-
-
-/* Normal Definition */
- @margin: 2%;
- @lineheight: 16px;
- @font_size : 11px;
-
-
- @the-border: 1px;
- @base-color: #111;
- @red: #842210;
-
- // general title page
- @title_h3_color : @color_010;
- @title_h3_color_shadow : #444444 ;
-
-
-// General header
-
- // color menu nav (gradient)
- @color_menu_nav_cl_1 : @color_020 ;
- @color_menu_nav_cl_2 : @color_021 ;
- @color_menu_nav_cl_3 : @color_022 ;
-
- // background menu exts, sub nav
- @color_bg_menuexts : @color_010;
-
-
-// Central content
-
- // tabs color text
- @color_tab_text_default : #ffffff;
- @color_tab_text_selected : @color_020;
- @color_tab_text_hover : #555555;
-
- // color bouton classique (gradient)
- @color_tabs_cl_1 : @color_020 ;
- @color_tabs_cl_2 : @color_021 ;
- @color_tabs_cl_3 : @color_022 ;
-
- // color bouton classique (gradient)
- @color_bouton_cl_1 : @color_020 ;
- @color_bouton_cl_2 : @color_021 ;
- @color_bouton_cl_3 : @color_022 ;
-
- // color bouton and link submit , confirm , valid (gradient)
- @color_bouton_submit_cl_1 : #248DBC ;
- @color_bouton_submit_cl_2 : #248DBC ;
- @color_bouton_submit_cl_3 : #B0F1F7 ;
-
- // color bouton and link back, annulate, retrun (gradient)
- @color_bouton_back_cl_1 : #000000 ;
- @color_bouton_back_cl_2 : #000000 ;
- @color_bouton_back_cl_3 : #5C5A5D ;
-
- // widget
- @color_widget_1 : @color_010; // title and th
-
-
- // block div edit / input gradient background
- @color_bg_gradient_base : #E4E4E4; // base color
- @color_bg_gradient_eob : 200; // deb gradient
- @color_bg_gradient_eon : 255; // end gradient
-
-
- // Table Datatable
- @color_datatable_tr_th : @color_010 ;
- @color_datatable_tr_th_txt : @color_011 ;
- @datatable_color_txt :#000000 ; // couleur text dans les tableau
-
- @bg_hover : #E6FF99; // hover row or filter
- @bg_hover_txt : #000000; // hover row or filter
-
- @bg_table_tr_odd : #F0F0F0;
- @bg_table_tr_even : #D7D7D7;
- @color_sorting : #84509A; // cols sorting
- @color_sorting_text : #A7A7A7;
-
-
- // FORM
- @bg_input : @color_011;
- @bg_input_border : @color_012;
- @bg_input_hover : #F0F0F0;
- @bg_input_border_hover : @color_010;
-
- // Split page / Pagination
- @color_split : @color_010;
- @color_split_active : @color_010;
- @color_split_active_text : #FFFFFF;
-
-/* Mixin */
-
- @import "element.less";
-
- .wrap () {
- text-wrap: wrap;
- white-space: pre-wrap;
- white-space: -moz-pre-wrap;
- word-wrap: break-word;
- }
-
- /**
- * Reto-compatibilte oscommerce oscss < 2.xx
- */
- /* info box block droit */
- .infoBoxHeading {
- background-color: #ffffff;
- border-width:0;
- .rounded(5px);
- }
- .infoBoxContent{
- border-width: 0px 1px 0px 1px;
- border-color: #E6E6E6;
- border-style: solid;
- padding: 2px 2px 5px 10px;
- font-size: 10px;
- color: #000;
- background-color: #f1f1f1;
- list-style:none;
- line-height:1.7em;
- .rounded(5px);
- }
- .infoBoxContent li{clear:both; }
-
-
-
-
-
-
-
-
- /* Generalite */
-
-
- * {margin:0;padding:0}
- a :link,
- a:visited {text-decoration: underline; color:#000;}
- a:hover { text-decoration: none; }
- img { border-width:0 ; margin:0; padding:0; }
- h1 { font-size: 2em ; padding:1em; }g37
- h1 img {border-width:0 ; margin:0; padding:0;}
- h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
- h3 {
- clear:both;
- color: @title_h3_color;
- font-size: 20px;
- font-weight: bold;
- padding: 5px 0 5px 10px;
- text-shadow: 0 1px 1px @title_h3_color_shadow ;
- }
- h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
- p {padding:1em;}
- ul {list-style:none;}
- th { margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
-
- input,
- select,
- textarea,
- button {
- padding:2px 5px;
- font-family: Verdana,Arial,sans-serif;
- font-size: (@font_size*1.3);
- border:1px solid @bg_input_border;
- background: @bg_input ;
- .border-radius(5px);
- .rounded(5px);
-
- &:hover{
- border:1px solid @bg_input_border_hover;
- background: @bg_input_hover ;
- }
- }
-
-
- /* general class */
- .error{ color:red; }
- .info{ color:blue;}
- div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
- .alert{ color:#ae0405; }
- .fright{ float:right; }
- .fleft {float:left; }
- .tleft{text-align:left}
- .tright{text-align:right}
- .tcenter{text-align:center}
- .inline ,
- .inline *,
- div#central .inline *{ display:inline-block; }
- .nobr {white-space:nowrap;}
-
- .w_100 {width:99%;}
- .w_90 {width:89%;}
- .w_80 {width:79%;}
- .w_70 {width:69%;}
- .w_60 {width:59%;}
- .w_50 {width:49%;}
- .w_40 {width:39%;}
- .w_30 {width:29%;}
- .padd_w {padding-left:10px; padding-right:10px;}
- .padd_h {padding-top:10px; padding-bottom:10px;}
- .linkdoc {font-size:11px; font-weight:bold; color:blue; }
- .spacer {clear:both;}
- .fieldRequired { color: #ff0000; }
- .smallText { font-size: 0.8em; }
- .errorText { color: #ff0000; }
-
-
- /* --- message box --- */
- .messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
- .messageStack{ font-family: Verdana, Arial, sans-serif;}
- .messageStack li{padding:2px 0;}
- .messageStackError,
- .messageStackWarning { background:#fbe3e1;}
- .messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
- .messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
-
- /* toogle item complet js action */
- h4.Ctrtirroir,
- h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: (@font_size*1.1); }
- .Ctrtirroir {
- background:transparent url('../../../images/icons/icon_down.gif') left top no-repeat;
- padding-left:20px;
- height:16px;
- }
- .Ctrtirroir.closed {background:transparent url('../../../images/icons/icon_arrow_right.gif') left top no-repeat; }
- fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
-
-
-
-
-
-
-
-
-
-
-
-
-body {
- background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
- background-attachment:fixed;
-// color:#000;
- margin:0;
- padding:0;
- font: normal @font_size Verdana, Arial, sans-serif;
-}
-
-
-/**
- * Nav Bar , master menu
- * */
-nav {
- background:transparent ;
- height:(@lineheight * 1.55);
- border-top: 1px solid #fff;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_default;
- text-decoration: none;
- }
-
- a {
- display:block;
- color:#FFFFFF;
- text-decoration:none;
- height:(@lineheight * 1.1);
- text-align:center;
- font:normal @font_size Verdana, Arial, sans-serif;
-
- &:link,
- &:visited {
- color:#FFFFFF;
- }
-
- &:hover {
- color:#000000;
- text-decoration:none;
- }
- }
-
- .disabled{
- display:none;
-
- &:hover { display:none;}
- }
-
- .ssmenu a {
- color:#9C9A9B;
- text-shadow: none;
- padding:2px 0px 2px 26px;
- text-decoration:none;
- line-height:(@lineheight * 1.1);
- border:none;
-// width:154px;
- text-align:left;
-// white-space:nowrap;
-
- &:hover {
- background-color:#999;
- color:#fff;
- text-shadow: 0 1px 0 #000;
- text-decoration:none;
- }
- }
-
- ul{
- list-style:none;
-
- .ssmenu {
- margin:0 1px 1px 0;
- background:#ccc;
- border-left:1px solid #747474;
-
- .sub{
- &:after{ content: " >>"; }
- }
- .ssmenu{
- position:absolute;
- top:-1px;
- left:180px;
- display:none;
- z-index:15;
-
- .sub{
- &:after{ content: " >>"; }
- }
- }
- }
-
- li{
- position:relative;
- float:left;
- padding: 0 5px;
- height:(@lineheight * 1.55);
-
- &:hover ul { display:block; }
-
- ul{
- position:absolute;
- top:(@lineheight * 1.55);
- left:0;
- display:none;
- z-index:10;
-
- li{
- float:none;
- width:200px;
- background:#303030 ;
-// z-index:15;
-
-// ul{
-// z-index:20;
-//
-// li{
-// z-index:25;
-// }
-// }
- }
- }
- }
-
- .ssmenu li:hover ul.ssmenu,
- .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
- }
-
- ul.fleft{
- .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
-
- a{
- padding-top:4px;
- padding-left: 20px;
- }
- }
-
-
- /* Switcher */
- p.themeSwitcher {
- float:right;
- margin:0;
- padding:0 1em 0 0;
- text-align:right;
- color:#FFFFFF;
-
- select {
- margin:2px;
- padding:0;
- vertical-align:middle;
- width:100px;
- background-image: none;
- border:1px solid #D7D7D7;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( #E4E4E4, 200, 255) ;
-
-
- option{ color:#FFFFFF;font-size:(@font_size *0.9); }
- }
- }
-
-
-}
-
-/* user bar */
-div#user {
- background:#303030 ;
- border-top: 1px solid #3F3F3F;
- padding-right:10px;
- height:27px;
-
- ul#MenuExts{
-
- li{
- position:relative;
- float:left;
- background: none repeat-x scroll 0 0 @color_bg_menuexts;
- height: 25px;
- padding: 0 8px;
-
- a {
- display:block;
- padding-top:4px; color:#000;
- text-decoration:none;
- text-shadow:none;
- height:18px;
- text-align:center;
-// font:normal @font_size Verdana, Arial, sans-serif;
- color:#FFFFFF;
-
- &:hover{
- color:gray;
- }
- }
- }
- }
-}
-
-
-
-/**
- * Structure base html
- * no specific forms (cf section forms )
- */
-
- .configuration{
- div#central{
-
- div#ssmenu{
- display: block;
- height: 20px;
- line-height: 20px;
- padding: 5px 10px;
- width: 100%;
- }
-
- div.box_right {
- right:0;
- width:39%;
-
- ul{ list-style:none; }
- }
- }
- }
-
-// .page {
- // div#central{
- // }
- // }
-
- div#glob {
- width:100%;
- z-index:10;
- height:100%;
-
- header#header {
- background:black;
- min-width:900px;
- width:90%;
- margin:0 0;
- position:fixed;
- z-index:10;
-
- div#headInfos {
- display:inline-block;
- height:25px;
- margin:0;
- padding:0;
- width:100%;
- color:#FFFFFF;
-
- h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
-
- a,
- span{padding-right:1em; color:#FFFFFF; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
-
- a:hover{text-decoration:underline;}
- }
- }
-
- div#central{
- position:relative;
- padding:10px 5px;
- top:79px;
- margin-bottom: 79px;
- border-left: 1px solid black;
- border-right: 1px solid black;
- border-bottom: 1px solid black;
- background:#FFFFFF;
-
- div.box_uniq {
- width:100%;
- float:left;
- padding: 0;
- background:none;
- }
-
- div.box_left { width:60%; float:left; }
-
- div.box_right {
- width:39%;
- float:right;
-// background:#f1f1f1;
-// background-color: #ffffff;
- }
-
- h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
- }
-
- }
-
- div#center,
- div#bas {
- margin: 0 auto;
- position: relative;
- min-width:900px;
- width:90%;
- }
-
- div#bas {
-// margin-top:8em;
- clear:both;
- height:25px;
- background:#303030;
- color:#FFFFFF;
-
- a,
- a:link,
- a:visited {
- text-shadow : none;
- padding: 4px 25px;
- color:#FFFFFF;
- }
-
- // logo link partenaires
- .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
- }
- footer {
- background: #505050;
- clear:both;width:100%;
- text-align:center;
- color:#FFFFFF;
-
- a,
- a:link,
- a:visited {
- color:#FFFFFF;
- text-decoration: none;
-
- &:hover{
- text-decoration: underline;
- }
- }
- }
-
-
-
-
-/**
- * Bouton
- */
- .button,
- select.button,
- input[type=submit].button,
- input[type=button].button,
- button.button,
- a.button{
- display: inline-block;
- font-family:Arial;
- white-space:nowrap;
- float:right;
- color:#FFFFFF;
- vertical-align:middle;
- border:1px solid #fff;
- height: 25px;
- line-height: 25px;
- margin:8px 20px;
- text-shadow: none;
-
- .rounded(5px);
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
- input[type=image].button {
- float:left;
- height:18px;
- width:18px;
- }
-
- input.button,
- button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
-
-
- a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{color:#FFFFFF;text-decoration:none; }
-
- a.button,
- select.button,
- input.button,
- button.button {
- .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
- }
-
- a.button.ActionYes,
- input.button.ActionYes,
- input[type=image].button.ActionYes,
- input[type=submit].button.ActionYes,
- button.button.ActionYes {
- .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
- }
-
- a.button.ActionBack,
- input[type=image].button.ActionBack,
- button.button.ActionBack {
- color:#FFFFFF;
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
- }
-
-
- input:hover.button,
- button:hover.button{background:#797979;color:#FFFFFF;}
-
- a:hover.button,
- input:hover.button,
- button:hover.button {
- .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
- opacity:0.6;
- }
-
- a:hover.button.ActionYes,
- input:hover.button.ActionYes,
- button:hover.button.ActionYes {
- .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
- color:black;
- }
-
- a.button.ActionBack,
- input.button.ActionBack,
- button.button.ActionBack {
- color:#FFFFFF;
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
- }
-
- a:hover.button.ActionBack,
- input:hover.button.ActionBack,
- button:hover.button.ActionBack {
- .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
- }
-
- input[type=image].button,
- a.buttonimg img{ opacity:1;}
-
- input[type=image]:hover.button ,
- a:hover.buttonimg img,
- a.buttonimg img:hover{ opacity:0.6;}
-
- /* Spe buttons broswer img */
- a.button.browser {height:24px;}
- a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
- .row_action a.button {margin:0;}
-
-
- /* Block html content all bouton */
- .button_nav{
- clear:both;
-
- form{
- float:right;
- width:100px;
-
- p {margin:0;padding:0;}
- }
- }
-
-
-/**
- * Section for block widget in dashbord
- */
-.widget{
- float: left;
- margin: @margin;
- width: (100% - (@margin * 1) );
- .rounded(5px);
- .bw-gradient( #E4E4E4, 255, 200) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- h3 {
- color: @color_widget_1;
- clear: both;
- margin-bottom:@margin;
- padding:5px 0 5px 5px;
- .rounded(5px);
- .bw-gradient( #E4E4E4, 255, 200) ;
-
- a{
- color: @color_widget_1;
- text-decoration:none;
-
- &:hover{
- color: gray;
- }
- }
- }
-
- ol {padding-left:25px;}
-
- .dataTableBase tr{
- background-color: #F0F0F0;
-
- th {
- height: 20px;
- line-height: 20px;
- background : @color_widget_1;
- }
-
- &:nth-child(odd) {
- background-color: #D7D7D7;
- }
-
- a{
- font-weight : bold;
- color: @color_widget_1;
- }
- }
-
-
- /* sous menu en widget , specifique page conf et dashboard configuration */
- div#ssmenu{
- a {
- background: none repeat scroll 0 0 #797979;
- border-right: 1px solid #444444;
- clear: both;
- color: #FFFFFF;
- font-size: @font_size;
- margin: 0 0 1px 25px;
- padding: 5px 10px;
- text-shadow: 0 1px 0 #000000;
- width: 40%;
-
- &:hover {
- float:left;
- margin:0;
- background:#eee;
- color:#000;
- text-shadow: 0 1px 0 #fff;
- }
- }
- }
-}
-
-
-.edit{
- background:#eee;
- background-attachment:none;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( #E4E4E4, 190, 240) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-}
-
-
-/**
- * Dipslay all listing in array
- */
- .dataTableBase,
- .dataTableSearch,
- .dataTable{
- width:100%;
- border-width:0;
- border:1px solid @color_012;
- .rounded(5px);
-
- a.button,
- input[type=submit].button,
- input[type=image].button,
- button.button {
- margin:0;
- }
-
-
- tr {
- padding:0;
- margin:0;
-
- th{
- background-color: @color_datatable_tr_th;
- font-size:@font_size;
- font-weight:bold;
- text-align:center;
- color: @color_datatable_tr_th_txt;
- text-shadow:none;
- }
- }
-
-
- tbody{
-// background-color: #f1f1f1;
-
- // rollover rows for mouse
- tr.odd,
- tr.even{
- border:none;
- cursor:default;
-
- &:hover{
- background-color: @bg_hover;
- cursor: pointer;
-
- td{
- background-color: @bg_hover;
- }
- td,
- td a {
- color : @bg_hover_txt ;
- }
- }
-
- td{
- line-height:( @lineheight * 0.1 );
- color: @datatable_color_txt;
- padding: 2px;
- font-size: 10px;
- cursor:default;
-
- a{
- text-decoration:none;
- color: @datatable_color_txt;
- }
-
- /* Replace value by icon */
- .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
-
- .edit-input-value .Flag-0.txt,
- .edit-input-value .Val-0.txt { display:none}
- .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
- .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
-
- .edit-input-value .Flag-1.txt,
- .edit-input-value .Val-1.txt { display:none}
- .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
- .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
- }
- .row_action {
- min-width:100px;
- text-align:right;
- }
-
- .row_action_large {
- min-width:250px;
- text-align:right;
- }
-
- .row_customers {
- min-width:100px;
- text-align:left;
- }
-
- .sorting_1{
- background-color: ( @color_sorting + 50);
- }
- .sorting_1,
- .sorting_1 a{
- color : ( @color_sorting_text + 50);
- }
-
- .sorting_2{
- background-color:( @color_sorting + 65);
- }
- .sorting_2,
- .sorting_2 a{
- color :( @color_sorting_text + 65);
- }
-
- .sorting_3{
- background-color:( @color_sorting + 80);
- }
- .sorting_3,
- .sorting_3 a{
- color : (@color_sorting_text + 80);
- }
-
-
- }
-
- .odd{
- background-color: @bg_table_tr_odd;
- }
-
- .even{
- background-color: @bg_table_tr_even;
- }
- }
-
- tfoot tr td input {width:80%;text-align:left;}
- }
-
-
- .dataTables_wrapper {
- min-height:200px;
- .bw-gradient( #E4E4E4, 200, 255) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- .paging_full_numbers{
-
- .paginate_button,
- .paginate_active{
- .rounded(5px);
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- .paginate_active{
- color : @color_split_active_text;
- background-color: @color_split_active;
- }
- }
-
- .top{
- padding: 1px 10px;
- .border-radius( 5px,0, 0, 5px);
-
- .dataTables_filter {
- clear: both;
- position: relative;
- right: 0;
- text-align: right;
- margin-bottom: 5px;
- }
- .dataTables_length {
- float: left;
- width: 40%;
- }
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
- }
-
- .bottom {
- padding: 5px 10px;
- .border-radius( 0, 5px, 5px, 0);
-
- .TableTools {
- margin: 0 0 5px 0;
- padding:0;
- height:34px;
- }
-
- .dataTables_length {
- float: left;
- width: 40%;
- }
-
- .dataTables_paginate {
- float: right;
- text-align: right;
- padding-top: 0px;
- }
-
- }
- }
-
- /**
- * class qui rend element enfant visible au survol de l'element parent
- */
- .view.fils {display:none}
- .dataTableBase tr:hover .view.fils,
- .dataTable tr:hover .view.fils,
- .dataTableRow.Selected .view.fils,
- .view.parent:hover .view.fils{display:block;height:13px}
-
-
-
-
- /**
- * Listing Filter for Datatable
- */
- div#central form#filters {
- padding:0;
- margin: 0 1em;
- width:98%;
- .bw-gradient( #E4E4E4, 200, 255) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- .border-radius( 5px, 5px, 5px, 5px);
- .rounded(5px);
-
- p.Ctrtirroir {
- padding: 2px 10px 2px 20px;
- font-size:(@font_size*1.2);
- width:95.2%;
-
-// border-color: #CCCCCC #CCCCCC -moz-use-text-color;
-// border-style: solid solid none;
-// border-width: 1px 1px medium;
- color: black;
- font-weight: bold;
-
- &:hover {
- background-color: @bg_hover;
- cursor:pointer;
- }
- }
-
- div#filtre {
- padding:0;
- border:1px solid #AAAAAA;
- background: transparent;
-
- ul.ui-tabs-nav {
- width:99.6%;
-
- li{
- line-height:1em;
- width:auto;
- }
- }
- }
-
- fieldset label{width:auto;}
-
- li.select{
- color : @color_tab_text_selected ;
- }
- }
-
-
-
-/**
- * Forms
- */
- fieldset {
- margin: 0.3em ;
- padding:0.3em;
- border:none;
-
- p {
- margin: 0.3em;
- padding:0.3em;
- }
-
- select,
- input[type="text"] { min-width:62%; display:inline-block;}
-
- select option {display:block; float:none;clear:both;width:100%}
-
- label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
-
- ul{
- list-style:none;
- .rounded(5px);
- }
- // Cat list lors edition article ou cms
- ul.LinkToView{
- overflow: auto;
- max-height: 160px;
- background-color: #fff;
- padding: 5px;
- line-height: 15px;
- border: 1px solid #666;
- }
- }
-
- input.radioInput {width:30px;}
-
- div#form_bt { width: 80%; margin: 1em 2em;}
- ul.form_radio_inline{display:inline-block;}
- .noselected{}
- .selected{background:#f0d4bf;}
- .color_type {display: inline-block; padding: 6px 0;background: none repeat scroll 0 0 transparent; width: 100% !important;}
-
-
- // master central display
- div#central form{
- padding:0.5em 1em;
-
- label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
-
- fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
-
- textarea{ vertical-align:baseline;}
-
- p{
-
-
-// input[type="radio"],
- input[type="checkbox"] { float:right; }
-
- select,
- input[type="text"] {
- margin:5px 15px;
- }
- select{
- padding:1px 0 0 0;
- height:(@lineheight * 1.3);
- line-height:(@lineheight * 1.3);
- }
- }
- p.new_product_img {
- float:left;
- padding:5px;
- margin : 0 auto;
- text-align:center;
- width:98%;
- border:1px solid @color_012;
- .border-radius(5px,5px,5px,5px);
-
- img{
- margin:auto;
- max-width: 300px;
- }
- }
-
-
- ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
-
- .block_form {
- .block_input{
- text-shadow:0 1px 0 #fff;
- width:94.9%;
- margin:2px 1px;
- display:inline-block;
- text-align: left;
- background:#C9C9C9;
- float:left;
- line-height:18px;
- padding:5px 5px 10px 5px;
- border:1px solid #D7D7D7;
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( #E4E4E4, 200, 255) ;
-
-
- span.value_edit {clear:both;display:inline-block; width:100%;}
-
- br,
- span.value_edit br{display:none;}
-
- label br {display:inline-block;}
-
- span.edit-input,
- span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
-
- span.edit-input{
- white-space:nowrap;
-
- input{float: left;}
-
- .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
- .edit-input-value {padding-left:12px;}
- /* remplacement true /false par icone */
- .edit-input-value.Val-true ,
- .edit-input-value.Val-false {font-size:0;}
- .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
- .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
- }
- }
-
- .block_input.tirroir {float:none;}
-
- .tabs_lang{width:98.5%; float:left;}
- }
-
- .block_field {
- text-shadow:0 1px 0 #fff;
- width:98.9%; margin:2px ;
- display:inline-block;
- text-align: left;
- padding: 5px;
- float:left;
-// background:#eee;
-// .border-radius(5px);
-// .rounded(5px);
-// .bw-gradient( #E4E4E4, 200, 255) ;
-// .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- .tabs,
- .tabs_lang{
- width:96.5%;
- margin:0 2px ;
- display:inline-block;
- text-align: left;
- padding:0 5px;
- float:left;
-// background:#eee;
- }
-
- .tabs_lang ul.ui-tabs-nav,
- .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
- }
-
- .block_input label.inline { white-space:nowrap; width: 20%;}
-
- .edit.col_right .block_input{
- width:95%;
-
- label{width:20%;text-align:left;font-weight:bold}
- }
-
- .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
-
- .input-multi input[type="checkbox"],
- .input-multi input[type="radio"]{float:none;}
-
-
- }
-
- div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
-
- /* Select Categorie */
- div#central #CurrentPathSelect *,
- div#central #CurrentPathSelect form {
- margin:@margin 0;
- padding:0;
- width:100%;
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- select#cPath {
- margin:0;
- font-size:(@font_size * 1.3);
- color:black;
- font-weight:bold;
- padding:0.2em 0.6em;
- height: (@lineheight * 1.8) ;
-
- &:hover {background-color: @bg_hover;cursor:pointer; }
-
- option {
- margin:0;
- background-color:#f5f5f5;
- }
- }
- }
-
-
- /**
- * Section specific Orders page
- */
- .main-orders{
- fieldset{
- .border-radius(5px);
- .rounded(5px);
- .bw-gradient( #E4E4E4, 190, 240) ;
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- .box_uniq.block_form{
- fieldset{
- margin:1% 2%;
- padding:0 1%;
- }
-
- .w_50 {
- width:44%;
- }
- }
-
- block_input{
- br,
- span.value_edit br{display:block;height:0;}
- }
-
- table.main-orders {
- margin:1%;
- width:98%;
-
- thead tr th{
- background:#303030;
- color:#FFFFFF;
- font-weight: normal;
- text-shadow: none;
- }
-
- tr th{
- margin:0;
- background:#eee;
- height:(@lineheight * 1.3);
- line-height:(@lineheight * 1.3);
- }
- }
-
- .block {
- width: 46%;
- margin:@margin (@margin / 2);
- background:#c9c9c9;
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
-
- }
- }
-
- /* Ajsutement customer page */
- div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
-
-
- /**
- * External - plugin - others
- */
-div#fancybox-outer {
- background:none;
- border:none !important;
-
- div#fancybox-content {
- .bw-gradient( #E4E4E4, 200, 255) ;
- .border-radius(0,5px,5px,0);
-
- h3{
- color:#FFFFFF;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
- .border-radius(5px,0,0,5px);
- }
- }
-
-
- }
- // UI
- /* Layout helpers */
- .ui-dialog {
- .ui-widget-header{
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
- .border-radius(5px,0,0,5px);
- }
- .ui-dialog-content{
- .bw-gradient( #E4E4E4, 200, 255) ;
- .border-radius(0,5px,5px,0);
- }
- }
-
- .ui-helper-hidden { display: none; }
- .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
- .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: @font_size; list-style: none; }
- .ui-helper-clearfix {
- zoom: 1;
-
- &:before,
- &:after { content: ""; display: table; }
- &:after { clear: both; }
- }
- .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
- /* Interaction states */
- .ui-state-default,
- .ui-widget-content .ui-state-default,
- .ui-widget-header .ui-state-default {
- font-weight: normal;
- color: @color_tab_text_default;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_default;
- text-decoration: none;
- }
- }
-
- .ui-state-hover,
- .ui-widget-content .ui-state-hover,
- .ui-widget-header .ui-state-hover,
- .ui-state-focus,
- .ui-widget-content .ui-state-focus,
- .ui-widget-header .ui-state-focus {
-// background: #dadada url(img/1/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
- .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
- font-weight: normal;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_hover;
- text-decoration: none;
- }
- }
-
- .ui-state-hover a,
- .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-
- .ui-state-active,
- .ui-widget-content .ui-state-active,
- .ui-widget-header .ui-state-active {
- border: 1px solid #aaaaaa;
- background: #ffffff url(img/1/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
- font-weight: normal;
- color: @color_tab_text_selected;
-
- a,
- a:link,
- a:visited {
- color: @color_tab_text_selected;
- text-decoration: none;
- }
- }
-
-
- .ui-widget :active { outline: none; }
-
- // UI generic
- .ui-widget {
- font-family: Verdana,Arial,sans-serif;
- font-size: (@font_size * 1.1);
-
- .ui-widget { font-size: @font_size; }
-
-// input,
-// select,
-// textarea,
-// button { font-family: Verdana,Arial,sans-serif; font-size: (@font_size*1.2); }
- }
-
- .ui-widget-content {
-// background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
- color: #222222;
- }
-
- .ui-widget-header {
- border-radius: 0;
- border-bottom: 1px solid #aaaaaa;
- color: #222222;
- font-weight: bold;
-
- a { color: #222222; }
- }
-
-
-
- // UI tabs
- .ui-tabs {
- position: relative;
- padding: .2em;
- zoom: 1;
-
- .ui-tabs-nav {
- margin: 0;
- padding: 0;
-
- li {
- list-style: none;
- float: left;
- position: relative;
- top: 1px;
- margin: 0 .1em 0 0;
- border-bottom: 0 !important;
- padding: 0;
- white-space: nowrap;
-
- a {
- float: left;
- padding: .3em 0.5em;
- text-decoration: none;
- cursor: pointer;
- font-size: (@font_size*1.3);
- font-weight : bold;
- }
- }
-
- .ui-tabs-selected {
- margin-bottom: 0;
- padding-bottom: 1px;
- cursor: not-drop;
- }
- .ui-tabs-selected,
- .ui-tabs-selected a,
- .ui-state-disabled a,
- .ui-state-processing a { cursor: not-allowed !important; }
- }
-
- .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
-
- .ui-tabs-panel { display: block; border-width: 0; padding: 0.3em 0.3m; background: none; }
-
- .ui-tabs-hide { display: none !important; }
-
- div.box_uniq { width:99%; }
- }
-
-
-
- /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
- div#fancybox-inner{
- h3 { background: none repeat scroll 0 0 black; color: #FFFFFF; font-weight: normal; height: 21px; left: 0; line-height: 20px; padding: 0; position: absolute; text-align: center; text-shadow: none; top: 0; width: 100%;}
-
- form {
- float:left;
- position: relative;
- top:20px;
- padding: 0 0 30px;
- margin:0 0 30px 0;
-
- h3{ top: -25px;}
-
- fieldset {
- margin: 5px;
- padding:5pxem;
- border:none;
-
- label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
-
- select,
- input[type="text"] { min-width:65%; display:inline-block;float:right;}
-
- .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
- }
- }
- }
-
-
-
- // Toolips
- .tooltip{
- position:absolute;
- z-index:999;
- left:-9999px;
- background-color:#dedede;
- padding:5px;
- border:1px solid #fff;
- width:250px;
-
- p{
- margin:0;
- padding:0;
- color:#fff;
- background-color:#222;
- padding:2px 7px;
- }
- }
-
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 14:20:27
|
Revision: 4558
http://oscss.svn.sourceforge.net/oscss/?rev=4558&view=rev
Author: oscim
Date: 2012-08-04 14:20:21 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 13:45:37 UTC (rev 4557)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 14:20:21 UTC (rev 4558)
@@ -28,7 +28,7 @@
/* base dimension */
@display_max_width : 900px;
-@display_width : 100% ;
+@display_width : 98% ;
/* Normal Definition */
@@ -42,14 +42,17 @@
@base-color: #111;
@red: #842210; // Fields required
-
-// header block
-@header_base_bg :transparent ;
-@header_info_bg : @color_015 ;
-// menu user
-@menu_user_bg : @color_013;
-@menu_user_border : @color_016 ;
-
+// header
+ // header block
+ @header_base_bg :transparent ;
+ @header_info_bg : @color_015 ;
+ @header_sub_height : 25px ;
+ // menu user
+ @menu_user_bg : none;
+ @menu_user_border : @color_013 ;
+ // background menu exts, sub nav
+ @color_bg_menuexts : @color_013;
+
// general title page
@title_h3_color : @color_010;
@title_h3_color_shadow : #444444 ;
@@ -82,10 +85,9 @@
@color_menu_nav_cl_2 : @color_021 ;
@color_menu_nav_cl_3 : @color_022 ;
-// background menu exts, sub nav
-@color_bg_menuexts : @color_010;
+
// Central content
/**
* tabs
Added: branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/css/less/header.less 2012-08-04 14:20:21 UTC (rev 4558)
@@ -0,0 +1,208 @@
+
+
+header#header {
+ background:@header_base_bg;
+ min-width:@display_max_width;
+ width:@display_width ;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:25px;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:@color_011;
+ background:@header_info_bg;
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+ h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:@color_011; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+}
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ background:transparent ;
+ height:(@lineheight * 1.55);
+ border-top: 1px solid @nav_border;
+
+ a,
+ a:link,
+ a:visited {
+ color: @nav_master_link;
+ text-decoration: none;
+ text-shadow:none;
+ }
+
+ a {
+ display:block;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal @font_size Verdana, Arial, sans-serif;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+
+ &:link,
+ &:visited {
+ color:@nav_master_link;
+ }
+
+ &:hover {
+ color:@nav_master_link_hover;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color: @submenu_link;
+ padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+ text-align:left;
+
+ &:hover {
+ background-color:@submenu_bg_hover;
+ color:@submenu_link_hover ;
+ text-shadow: 0 1px 0 @submenu_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:@submenu_bg;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul { display:block; }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+ }
+
+ ul.fleft{
+ .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:@color_011;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+
+ option{
+ display:block;
+ color:@color_013;
+ font-size:(@font_size *0.9);
+ }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ background:@menu_user_bg ;
+ border-top: 1px solid @menu_user_border;
+ padding-right:10px;
+ height:25px;
+
+ ul#MenuExts{
+
+ li{
+ position:relative;
+ float:left;
+ background: none repeat-x scroll 0 0 @color_bg_menuexts;
+ height: 25px;
+ padding: 0 8px;
+ border-left:1px solid @menu_user_border;
+
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:( @lineheight * 1.3);
+ text-align:center;
+ color:@color_011;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+}
+
+
+
+/* Specifique menu */
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 13:45:37 UTC (rev 4557)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 14:20:21 UTC (rev 4558)
@@ -15,6 +15,8 @@
@color_012 : #ACAAAC;
@color_013 : #303030;
@color_014 : #D7D7D7;
+@color_015 : #000000;
+@color_016 : #3F3F3F;
// gardient red
@color_020 : #AE0405 ;
@@ -169,7 +171,7 @@
// Load generic element and style
@import "../defaut/css/less/element.less";
-@import "../defaut/css/less/header.less";
+@import "css/less/header.less";
@import "../defaut/styles.less";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 13:45:43
|
Revision: 4557
http://oscss.svn.sourceforge.net/oscss/?rev=4557&view=rev
Author: oscim
Date: 2012-08-04 13:45:37 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/element.less
branches/2.1.1/catalog/admin/includes/template/oscss/css/
branches/2.1.1/catalog/admin/includes/template/oscss/css/less/
Copied: branches/2.1.1/catalog/admin/includes/template/defaut/css/less/element.less (from rev 4553, branches/2.1.1/catalog/admin/includes/template/defaut/element.less)
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/css/less/element.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/css/less/element.less 2012-08-04 13:45:37 UTC (rev 4557)
@@ -0,0 +1,136 @@
+/*---------------------------------------------------
+ * LESS Elements 0.6
+ * ---------------------------------------------------
+ * A set of useful LESS mixins by Dmitry Fadeyev
+ * Special thanks for mixin suggestions to:
+ * Kris Van Herzeele,
+ * Benoit Adam,
+ * Portenart Emile-Victor,
+ * Ryan Faerman
+ *
+ * More info at: http://lesselements.com
+ * -----------------------------------------------------*/
+
+.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, @start),
+ color-stop(1, @stop));
+ background: -ms-linear-gradient(bottom,
+ @start,
+ @stop);
+ background: -moz-linear-gradient(center bottom,
+ @start 0%,
+ @stop 100%);
+}
+.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(@start,@start,@start)),
+ color-stop(1, rgb(@stop,@stop,@stop)));
+ background: -ms-linear-gradient(bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@start,@start,@start) 100%);
+ background: -moz-linear-gradient(center bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@stop,@stop,@stop) 100%);
+}
+.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
+ border-top: solid 1px @top-color;
+ border-left: solid 1px @left-color;
+ border-right: solid 1px @right-color;
+ border-bottom: solid 1px @bottom-color;
+}
+.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
+ -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+}
+.rounded(@radius: 2px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
+ -webkit-border-top-right-radius: @topright;
+ -webkit-border-bottom-right-radius: @bottomright;
+ -webkit-border-bottom-left-radius: @bottomleft;
+ -webkit-border-top-left-radius: @topleft;
+ -moz-border-radius-topright: @topright;
+ -moz-border-radius-bottomright: @bottomright;
+ -moz-border-radius-bottomleft: @bottomleft;
+ -moz-border-radius-topleft: @topleft;
+ border-top-right-radius: @topright;
+ border-bottom-right-radius: @bottomright;
+ border-bottom-left-radius: @bottomleft;
+ border-top-left-radius: @topleft;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.opacity(@opacity: 0.5) {
+ -moz-opacity: @opacity;
+ -khtml-opacity: @opacity;
+ -webkit-opacity: @opacity;
+ opacity: @opacity;
+}
+.transition-duration(@duration: 0.2s) {
+ -moz-transition-duration: @duration;
+ -webkit-transition-duration: @duration;
+ transition-duration: @duration;
+}
+.rotation(@deg:5deg){
+ -webkit-transform: rotate(@deg);
+ -moz-transform: rotate(@deg);
+ transform: rotate(@deg);
+}
+.scale(@ratio:1.5){
+ -webkit-transform:scale(@ratio);
+ -moz-transform:scale(@ratio);
+ transform:scale(@ratio);
+}
+.transition(@duration:0.2s, @ease:ease-out) {
+ -webkit-transition: all @duration @ease;
+ -moz-transition: all @duration @ease;
+ transition: all @duration @ease;
+}
+.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
+ -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+}
+.box-shadow(@arguments) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
+ -moz-column-width: @colwidth;
+ -moz-column-count: @colcount;
+ -moz-column-gap: @colgap;
+ -moz-column-rule-color: @columnRuleColor;
+ -moz-column-rule-style: @columnRuleStyle;
+ -moz-column-rule-width: @columnRuleWidth;
+ -webkit-column-width: @colwidth;
+ -webkit-column-count: @colcount;
+ -webkit-column-gap: @colgap;
+ -webkit-column-rule-color: @columnRuleColor;
+ -webkit-column-rule-style: @columnRuleStyle;
+ -webkit-column-rule-width: @columnRuleWidth;
+ column-width: @colwidth;
+ column-count: @colcount;
+ column-gap: @colgap;
+ column-rule-color: @columnRuleColor;
+ column-rule-style: @columnRuleStyle;
+ column-rule-width: @columnRuleWidth;
+}
+.translate(@x:0, @y:0) {
+ -moz-transform: translate(@x, @y);
+ -webkit-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 13:34:30 UTC (rev 4556)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 13:45:37 UTC (rev 4557)
@@ -171,7 +171,8 @@
@color_title_txt : @color_011;
// Load generic element and style
-@import "../defaut/element.less";
+@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/header.less";
@import "../defaut/styles.less";
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 13:34:30 UTC (rev 4556)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 13:45:37 UTC (rev 4557)
@@ -170,184 +170,6 @@
/**
- * Nav Bar , master menu
- * */
-nav {
- background:transparent ;
- height:(@lineheight * 1.55);
- border-top: 1px solid @nav_border;
-
- a,
- a:link,
- a:visited {
- color: @nav_master_link;
- text-decoration: none;
- text-shadow:none;
- }
-
- a {
- display:block;
- text-decoration:none;
- height:(@lineheight * 1.1);
- text-align:center;
- font:normal @font_size Verdana, Arial, sans-serif;
- text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
-
- &:link,
- &:visited {
- color:@nav_master_link;
- }
-
- &:hover {
- color:@nav_master_link_hover;
- text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
- text-decoration:none;
- }
- }
-
- .disabled{
- display:none;
-
- &:hover { display:none;}
- }
-
- .ssmenu a {
- color: @submenu_link;
- padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
- text-decoration:none;
- line-height:(@lineheight * 1.1);
- border:none;
- text-align:left;
-
- &:hover {
- background-color:@submenu_bg_hover;
- color:@submenu_link_hover ;
- text-shadow: 0 1px 0 @submenu_link_hover_shadow;
- text-decoration:none;
- }
- }
-
- ul{
- list-style:none;
-
- .ssmenu {
- margin:0 1px 1px 0;
- background:@submenu_bg;
-
- .sub{
- &:after{ content: " >>"; }
- }
- .ssmenu{
- position:absolute;
- top:-1px;
- left:180px;
- display:none;
- z-index:15;
-
- .sub{
- &:after{ content: " >>"; }
- }
- }
- }
-
- li{
- position:relative;
- float:left;
- padding: 0 5px;
- height:(@lineheight * 1.55);
-
- &:hover ul { display:block; }
-
- ul{
- position:absolute;
- top:(@lineheight * 1.55);
- left:0;
- display:none;
- z-index:10;
-
- li{
- float:none;
- width:200px;
- }
- }
- }
-
- .ssmenu li:hover ul.ssmenu,
- .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
- }
-
- ul.fleft{
- .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
-
- a{
- padding-top:4px;
- padding-left: 20px;
- }
- }
-
-
- /* Switcher */
- p.themeSwitcher {
- float:right;
- margin:0;
- padding:0 1em 0 0;
- text-align:right;
- color:@color_011;
-
- select {
- margin:2px;
- padding:0;
- vertical-align:middle;
- width:100px;
-
- option{
- display:block;
- color:@color_013;
- font-size:(@font_size *0.9);
- }
- }
- }
-
-
-}
-
-/* user bar */
-div#user {
- background:@menu_user_bg ;
- border-top: 1px solid @menu_user_border;
- padding-right:10px;
- height:25px;
-
- ul#MenuExts{
-
- li{
- position:relative;
- float:left;
- background: none repeat-x scroll 0 0 @color_bg_menuexts;
- height: 25px;
- padding: 0 8px;
- border-left:1px solid @menu_user_border;
-
- a {
- display:block;
- padding-top:4px; color:#000;
- text-decoration:none;
- text-shadow:none;
- height:( @lineheight * 1.3);
- text-align:center;
- color:@color_011;
-
- &:hover{
- color:gray;
- }
- }
- }
- }
-}
-
-
-
-/**
* Structure base html
* no specific forms (cf section forms )
*/
@@ -382,32 +204,7 @@
z-index:10;
height:100%;
- header#header {
- background:@header_base_bg;
- min-width:@display_max_width;
- width:@display_width ;
- margin:0 0;
- position:fixed;
- z-index:10;
-
- div#headInfos {
- display:inline-block;
- height:25px;
- margin:0;
- padding:0;
- width:100%;
- color:@color_011;
- background:@header_info_bg;
-
- h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
-
- a,
- span{padding-right:1em; color:@color_011; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
-
- a:hover{text-decoration:underline;}
- }
- }
+
div#central{
position:relative;
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 13:34:30 UTC (rev 4556)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 13:45:37 UTC (rev 4557)
@@ -168,8 +168,8 @@
@color_title_txt : @color_011;
// Load generic element and style
-@import "../defaut/element.less";
-
+@import "../defaut/css/less/element.less";
+@import "../defaut/css/less/header.less";
@import "../defaut/styles.less";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 13:34:36
|
Revision: 4556
http://oscss.svn.sourceforge.net/oscss/?rev=4556&view=rev
Author: oscim
Date: 2012-08-04 13:34:30 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/css/
branches/2.1.1/catalog/admin/includes/template/defaut/css/less/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 13:27:34
|
Revision: 4555
http://oscss.svn.sourceforge.net/oscss/?rev=4555&view=rev
Author: oscim
Date: 2012-08-04 13:27:27 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
amelioration structure des dossier du theme defaut du BO
modification diverse des themes
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/inc/preload-1.php
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
branches/2.1.1/catalog/admin/includes/template/defaut/languages/
branches/2.1.1/catalog/admin/includes/template/defaut/languages/fr_FR.txt
Added: branches/2.1.1/catalog/admin/includes/template/defaut/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/definition.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/definition.less 2012-08-04 13:27:27 UTC (rev 4555)
@@ -0,0 +1,182 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* define color generic , used in next define */
+// color
+@color_010 : #78222F;
+@color_012 : #ACAAAC;
+@color_014 : #D7D7D7;
+// blanc
+@color_011 : #FFFFFF;
+// noir
+@color_015 : #000000;
+@color_013 : #303030;
+@color_016 : #3F3F3F;
+
+// gardient red
+@color_020 : #AE0405 ;
+@color_021 : #AE0405 ;
+@color_022 : #FD3841 ;
+
+
+/* base dimension */
+@display_max_width : 900px;
+@display_width : 100% ;
+
+
+/* Normal Definition */
+@margin: 2%;
+@padding_base : 1%;
+@lineheight: 16px;
+@font_size : 11px;
+
+
+@the-border: 1px;
+@base-color: #111;
+@red: #842210; // Fields required
+
+
+// header block
+@header_base_bg :transparent ;
+@header_info_bg : @color_015 ;
+// menu user
+@menu_user_bg : @color_013;
+@menu_user_border : @color_016 ;
+
+// general title page
+@title_h3_color : @color_010;
+@title_h3_color_shadow : #444444 ;
+
+// Fields required
+@field_required : @red ;
+
+// message
+@color_warning : #FBE3E1 ;
+@color_success : #A1F7C2 ;
+@color_notice : #ECFF9C ;
+
+// General header
+
+// nav
+@nav_border : @color_011;
+@nav_master_link : @color_011;
+@nav_master_link_hover : #000000;
+@nav_master_link_hover_shadow : @color_011;
+
+@submenu_bg : @color_013;
+@submenu_bg_hover : #999;
+@submenu_link : #9C9A9B;
+@submenu_link_hover : @color_011;
+@submenu_link_hover_shadow : #000000;
+
+
+// color menu nav (gradient)
+@color_menu_nav_cl_1 : @color_020 ;
+@color_menu_nav_cl_2 : @color_021 ;
+@color_menu_nav_cl_3 : @color_022 ;
+
+// background menu exts, sub nav
+@color_bg_menuexts : @color_010;
+
+
+// Central content
+ /**
+ * tabs
+ */
+ // color bouton classique (gradient)
+ @color_tabs_cl_1 : @color_020 ;
+ @color_tabs_cl_2 : @color_021 ;
+ @color_tabs_cl_3 : @color_022 ;
+ // tabs color text
+ @color_tab_text_default : #ffffff;
+ @color_tab_text_default_shadow : @color_011;
+ @color_tab_text_selected : @color_020;
+ @color_tab_text_selected_shadow : @color_011;
+ @color_tab_text_hover : #ffffff;
+ @color_tab_text_hover_shadow : #555555;
+
+
+
+
+ /**
+ * Button
+ */
+ // color bouton classique (gradient)
+ @color_bouton_cl_1 : @color_020 ;
+ @color_bouton_cl_2 : @color_021 ;
+ @color_bouton_cl_3 : @color_022 ;
+
+ // color bouton and link submit , confirm , valid (gradient)
+ @color_bouton_submit_cl_1 : #248DBC ;
+ @color_bouton_submit_cl_2 : #248DBC ;
+ @color_bouton_submit_cl_3 : #B0F1F7 ;
+
+ // color bouton and link back, annulate, retrun (gradient)
+ @color_bouton_back_cl_1 : #000000 ;
+ @color_bouton_back_cl_2 : #000000 ;
+ @color_bouton_back_cl_3 : #5C5A5D ;
+
+
+ /**
+ * widget
+ */
+ @color_widget_title : @color_010; // title
+ @color_widget_bg_th : @color_010; // th
+
+// block div edit / input gradient background
+@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_eob : 200; // deb gradient
+@color_bg_gradient_eon : 255; // end gradient
+
+
+// Table Datatable
+@color_datatable_tr_th : @color_010 ;
+@color_datatable_tr_th_txt : @color_011 ;
+@datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+@bg_hover : #E6FF99; // hover row or filter
+@bg_hover_txt : #000000; // hover row or filter
+
+@bg_table_tr_odd : #F0F0F0;
+@bg_table_tr_even : @color_014;
+@color_sorting : #84509A; // cols sorting
+@color_sorting_text : #A7A7A7;
+
+
+// FORM
+@bg_input : @color_011;
+@bg_input_border : @color_012;
+@bg_input_hover : #F0F0F0;
+@bg_input_border_hover : @color_010;
+
+
+
+/**
+ * Split page / Pagination
+ */
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+
+
+
+// POPUP
+@color_title_txt : @color_011;
+
+// Load generic element and style
+@import "../defaut/element.less";
+
+@import "../defaut/styles.less";
+
+
+
+body {
+ background:#e4e4e4 url(../../../images/back.jpg) repeat-x;
+}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/gabarit-1.php 2012-08-04 13:27:27 UTC (rev 4555)
@@ -1,14 +1,13 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
@portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.0
- @date 24/10/10, 17:14
+ @version 2.1.1
+ @date 03/04/2012, 09:32
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-
/** Prechargement */
@include(DIR_WS_INCLUDES . 'content/'.$page_admin.'.top.inc');
require(DIR_WS_TEMPLATE.'inc/lib.template.php');
@@ -20,50 +19,71 @@
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
<title><?php echo $page_admin.' | '.TITLE; ?></title>
<base href="<?php echo tep_get_http().DIR_WS_ADMIN ?>" />
+
<?php
+ /** les structure */
+ if (($stylesheet=tep_test_gab_ele('definition','less')) !=false) tep_include_file ($stylesheet,true);
+
+ tep_include_file (DIR_WS_INCLUDES."javascript/less-1.3.0.min.js",true);
+
/** Appel des css */
if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
/** Fichier header systheme */
require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'header.php');
/** Appel des js */
tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-1.js",true);
- tep_include_file (DIR_WS_JS."jquery.min.js",true);
- @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc"); ?>
+ @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc");
+
+ ?>
</head>
<body class="<?php echo $page_admin; ?>">
-
+<div id="glob">
+<div id="center">
<!-- header //-->
- <div id="header">
+ <header id="header">
<?php if (($header=tep_test_gab_ele('header')) !=false) require($header); ?>
- <!-- menubar //-->
- <?php $menu=menu::resetInstance();
- $menu_link = '<div id="menubar">'."\n";
- $menu_link .= '<ul id="menutitre">'."\n";
- $menu_link .=$menu->cstr();
- $menu_link .= '</ul>'."\n";
- echo $menu_link;?>
- <ul class="fright">
- <li class="inline"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') ?><p class="themeSwitcher"><?php echo __('recently viewed') ?><?php echo tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"') ?></p></form></li>
- <li class="account inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) ?></a></li>
- <li class="userName inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) ?></a></li>
- </ul>
- </div>
+ <nav>
+ <!-- menubar //-->
+ <?php
+// $menu_link = '<div id="menubar">'."\n";
+ $menu_link = '<ul id="menutitre" class="fleft">'."\n";
+ $menu_link .=$menu->cstr();
+ $menu_link .= '</ul>'."\n";
+ echo $menu_link;?>
+ <ul class="fright">
+ <li class="inline"><?php echo tep_draw_form('menubookmark', 'index.php', '', 'get') ?><p class="themeSwitcher"><?php echo __('recently viewed') ?><?php echo tep_draw_pull_down_menu('page_admin',$Bookmark, '' , 'onchange="this.form.submit();"') ?></p></form></li>
- <!-- menubar_eof //-->
+ <li class="userName inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_ADMIN_ACCOUNT, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'users.png', HEADER_TITLE_ACCOUNT.' '.$login_firstname) ?></a></li>
+ <li class="account inline"><a class="buttonimg" href="<?php echo tep_href_link(FILENAME_LOGOFF, '', 'NONSSL') ?>"><?php echo tep_image(DIR_WS_ICONS. 'icon_logoff.png',HEADER_TITLE_LOGOFF) ?></a></li>
+ </ul>
+ </nav>
- <div id="user">
- <ul>
- <?php /** Appel des menu specifique au module ACA . Tous module chargé epeut inétegrer des bock au menu */ echo $generic_modules->_show_menu(); ?>
- <li class="inline">
- <?php /** themes swither */ echo tep_draw_form('menutheme', $current_page, '', 'get') .'<p class="themeSwitcher">Theme switcher: '. tep_draw_pull_down_menu('menu_theme', oscss_list_templates_admin() , $current_theme , 'onchange="this.form.submit();"') . '</p></form>'; ?>
- </li>
- <li class="langSelector">
- <?php /** Selecteur de lang */ echo tep_draw_form('languages', basename($PHP_SELF), '', 'get') .'<p class="themeSwitcher">'. tep_draw_pull_down_menu('language', language::ArrayPullDown(), language::LangueSelected(), 'onchange="this.form.submit();"').'</p></form>'; ?>
- </li>
- </ul>
+ <!-- menubar_eof //-->
+
+ <div id="user">
+ <?php if ($generic_modules->_show_menu() != false) : ?>
+ <ul id="MenuExts">
+ <?php echo $generic_modules->_show_menu(); /** Appel des menu specifique au module ACA . Tous module chargé epeut inétegrer des bock au menu */ ?>
+ </ul>
+ <?php endif; ?>
+<!-- <ul class="fright">
+ <li class="w_30 nobr ">
+ <form action="" method="post">
+ <div>
+ <select name="SearchSpeed">
+ <option value="products" <?php if($page_module=='products') echo ' selected="selected" ' ?>><?php echo __('quicksearch products') ?></option>
+ <option value="customers" <?php if($page_module=='customers') echo ' selected="selected" ' ?>><?php echo __('quicksearch customers') ?></option>
+ <option value="categories" <?php if($page_module=='categories') echo ' selected="selected" ' ?>><?php echo __('quicksearch categories') ?></option>
+ <option value="orders" <?php if($page_module=='orders') echo ' selected="selected" ' ?>><?php echo __('quicksearch orders') ?></option>
+ </select>
+ <input type='text' name="sSearch" value="<?php if(isset($_REQUEST['sSearch'])) echo $_REQUEST['sSearch']?>" onchange="this.form.submit();" />
+ </div>
+ </form>
+ </li>
+ </ul>-->
</div>
- </div>
+ </header>
<!-- header_eof //-->
<!-- central //-->
@@ -84,14 +104,19 @@
<!-- central_eof //-->
<div class="separator" ></div>
+
+
+
+<div class="separator" ></div>
+</div>
+</div>
<!-- footer_gabarit_eof //-->
<div id="bas">
<?php if (($footer=tep_test_gab_ele('footer')) !=false) require($footer); ?>
</div>
<!-- footer_gabarit_eof //-->
-
<!-- footer //-->
- <div id="footer">
+ <footer>
<?php require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'footer.php'); ?>
- </div>
- <!-- footer_eof //-->
\ No newline at end of file
+ </footer>
+ <!-- footer_eof //-->
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/header-1.php 2012-08-04 13:27:27 UTC (rev 4555)
@@ -1,17 +1,28 @@
<?php
/**
- @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2011 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.0.9
- @date 08/06/10, 12:09
+ @version 2.1.0
+ @date 21/03/11, 13:59
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
$class_widget="adminBlock";
+/// force call class notification
+require_once(DIR_WS_MODULES.'pages/adminNotif.php');
?>
<div id="headInfos">
<h1><?php echo tep_image(DIR_WS_TEMPLATE . 'img/1/oscss.png', 'osCSS'); ?></h1>
<h2><?php echo PROJECT_VERSION ;?></h2>
- <a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a>
+ <a href="<?php echo tep_catalog_href_link() ?>"><?php echo HEADER_TITLE_ONLINE_CATALOG ;?></a><span> | </span>
+
+ <a href="<?php echo tep_href_link(FILENAME_ADMINNOTIF, '', 'NONSSL') ?>" class="messages"><?php echo __('notifications') ?> (<?php echo adminNotif::CountNotif() ?>)</a><span> | </span>
+
+ <?php if($sess !=0) : ?>
+ <a href="<?php echo tep_href_link('', 'mode_menu=0', 'NONSSL') ?>" class="messages"><?php echo __('Admin menu') ?></a><span> | </span>
+ <?php elseif($sess !=1) : ?>
+ <a href="<?php echo tep_href_link('', 'mode_menu=1', 'NONSSL') ?>" class="messages"><?php echo __('Buyer menu') ?></a><span> | </span>
+ <?php endif; ?>
</div>
<?php load_widget_context(); ?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-1.php 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/inc/init_theme-1.php 2012-08-04 13:27:27 UTC (rev 4555)
@@ -9,13 +9,25 @@
*/
/* Init menu */
- $menu=menu::resetInstance();
+// menu::resetInstance();
+$masterm_[0]=array('inc'=>array() ,'exc'=>array('commercial','cms','catalog','customers','orders'));
+$masterm_[1]=array('inc'=>array() ,'exc'=>array('admin','configuration','modules'));
+// $masterm_[2]=array(array('inc'=>array('configuration','modules')) ,array('exc'=>array('configuration','modules')));
+if(isset($_GET['mode_menu'])){
+ $_SESSION['mode_menu'] = (int)$_GET['mode_menu'];
+}
+// else {
+ if(!isset($_SESSION['mode_menu'])) $_SESSION['mode_menu'] = 1;
+// }
+$sess=$_SESSION['mode_menu'];
+$menu=menu::resetInstance((array)$masterm_[$sess]['exc'],(array)$masterm_[$sess]['inc']); //'commercial'
+
/* Menu bookmarks */
if(isset($navigation->path[count($navigation->path)-1])) {
$der=$navigation->path[count($navigation->path)-1];
$Bookmark[]= array('id' =>$der['get']['page_admin'], 'text' => @constant('HEADING_TITLE') );
-}elseif(count($navigation->path) ==0 ){
+}elseif(count($navigation->path) ==0 && isset($_GET['page_admin'])){
$Bookmark[]= array('id' =>$_GET['page_admin'], 'text' => @constant('HEADING_TITLE') );
}
$Bookmark[]= array('id' =>'index', 'text' => 'Tableau de bord');
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/inc/preload-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/inc/preload-1.php 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/inc/preload-1.php 2012-08-04 13:27:27 UTC (rev 4555)
@@ -1,19 +1,25 @@
<?php
/**
- @licence GPL 2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
@package osCSS-2 <www http://www.oscss.org>
- @version 2.1.1
- @date 21/04/2012, 22:01
+ @version 2.1.0
+ @date 05/01/11, 17:14
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
+*/
- Definis les constanet de base de mise en forme pour le template.
- Initialisé tres tot, ce fichier est chargée quelque soit le type appel (FORCEAJAX/FORCEVIEW/NORMAL)
-*/
+
+
/* Definiton de constante pour la mise en forme */
/* Taille des image produits */
define('TEMP_BO_SMALL_IMAGE_WIDTH', '50');
define('TEMP_BO_SMALL_IMAGE_HEIGHT', '50');
define('TEMP_BO_HEADING_IMAGE_WIDTH', '150');
define('TEMP_BO_HEADING_IMAGE_HEIGHT', '150');
+
+/**
+ @brief modifiy format base form balise
+*/
+ formUtility::UpFormat('image_submit' , '<input type="submit" value="%s" title="%s" class="%s ActionYes" %s />');
?>
\ No newline at end of file
Added: branches/2.1.1/catalog/admin/includes/template/defaut/languages/fr_FR.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/languages/fr_FR.txt (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/languages/fr_FR.txt 2012-08-04 13:27:27 UTC (rev 4555)
@@ -0,0 +1,21 @@
+<?php
+/**
+ @licence GPL 2005-2010 The osCSS developers - osCSS Open Source E-commerce
+ @portion code Copyright (c) 2002 osCommerce
+ @package osCSS-2 <www http://www.oscss.org>
+ @version 2.1.0
+ @date 19/12/10, 17:50
+ @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ @encode UTF-8
+*/
+/* Block admin */
+$lang['quicksearch products']='Produits';
+$lang['quicksearch categories']='Categories';
+$lang['quicksearch customers']='Customers';
+$lang['quicksearch orders']='Commande';
+$lang['recently viewed']='Récement vu';
+
+/* dbl menu */
+$lang['Admin menu']='Administration';
+$lang['Buyer menu']='Gestion';
+?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 13:27:27 UTC (rev 4555)
@@ -326,6 +326,7 @@
background: none repeat-x scroll 0 0 @color_bg_menuexts;
height: 25px;
padding: 0 8px;
+ border-left:1px solid @menu_user_border;
a {
display:block;
@@ -382,9 +383,9 @@
height:100%;
header#header {
- background:black;
- min-width:900px;
- width:90%;
+ background:@header_base_bg;
+ min-width:@display_max_width;
+ width:@display_width ;
margin:0 0;
position:fixed;
z-index:10;
@@ -396,6 +397,7 @@
padding:0;
width:100%;
color:@color_011;
+ background:@header_info_bg;
h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
@@ -440,8 +442,8 @@
div#bas {
margin: 0 auto;
position: relative;
- min-width:900px;
- width:90%;
+ min-width:@display_max_width;
+ width:@display_width ;
}
div#bas {
@@ -607,7 +609,7 @@
*/
.widget{
float: left;
- margin: @margin;
+ margin: @margin ( @margin *0.5);
width: (100% - (@margin * 1) );
.rounded(5px);
.bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
@@ -727,6 +729,7 @@
tbody{
// rollover rows for mouse
+ tr,
tr.odd,
tr.even{
border:none;
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/stylesheet-1.css 2012-08-04 13:27:27 UTC (rev 4555)
@@ -7,314 +7,9 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
-body { background:#e4e4e4 url(../../../images/back.jpg) repeat-x; color:#000; margin:0; padding:0; font: normal 11px Verdana, Arial, sans-serif; }
-/* prepend */
- * {margin:0;padding:0}
- a:link,
- a:visited {text-decoration: underline; color:#000;}
- a:hover { text-decoration: none; }
- img { border-width:0 ; margin:0; padding:0; }
- h1 { font-size: 2em ; padding:1em; }
- h1 img {border-width:0 ; margin:0; padding:0;}
- h2 { font-size: 1.2em ;}
- h3 { font-size: 1.2em ;}
- h4 { font-size: 1em ; }
- h5 { font-size: 1em ; }
- p {padding:1em;}
-/* form defintion generale */
- #form_bt { width: 80%; margin: 1em 2em;}
- input.radioInput {width:30px;}
- fieldset { width: 80%; margin: 1em 2em; padding:1em; border:none; }
- fieldset p { margin: 1em 0 0 0; }
- fieldset input[type="text"] { min-width:65%; display:inline-block;}
- fieldset label { width: 70%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
- fieldset ul { list-style:none;}
- ul.form_radio_inline{display:inline-block;}
- .spacer {clear:both;}
-/* general class */
- .error{ color:red; }
- .info{ color:blue;}
- div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
- .alert{ color:yellow; }
- .fright{ float:right; }
- .fleft {float:left; }
- .tleft{text-align:left}
- .tright{text-align:right}
- .tcenter{text-align:center}
- .inline { display:inline-block; }
- .inline * { display:inline-block; }
- .nobr {white-space:nowrap;}
- #central form {padding:0.5em 1em;}
- .w_60 {width:59%;}
- .w_40 {width:39%;}
- .w_50 {width:49%;}
-
-/* buttons */
- .button{font-family:Arial; font-size:13px;white-space:nowrap; float:right;-moz-border-radius:5px; -webkit-border-radius: 5px;}
- input.button,
- button.button{background:#e3e5f0; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:black; -moz-border-radius:5px; -webkit-border-radius: 5px;}
- input.button:hover,
- button.button:hover{background:#797979; color:white;}
- a.button{background:#e3e5f0; border:1px solid #003c74; padding:2px 5px; margin:1px 2px ;color:black;text-decoration:none;-moz-border-radius:5px; -webkit-border-radius: 5px;height:15px; line-height:17px;}
- a.button:hover{background:#797979; color:white;text-decoration:none;}
- /* Spe buttons broswer img */
- a.button.browser {height:28px;}
-
-/* --- message box --- */
- .messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
- .messageStack{ font-family: Verdana, Arial, sans-serif;}
- .messageStackError,
- .messageStackWarning { background:transparent url(img/1/menu_bg_error.jpg) left top repeat-x;padding:0; height:20px;line-height:25px;}
- .messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; padding:0; height:20px;line-height:25px;}
- .messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; padding:0; height:20px;line-height:25px;}
-
-/* Onglet */
- .tabPage { border: solid #ccc; border-width: 0px 1px 1px 1px; background: #f5f5f5; position: relative; top: 0; z-index: 0; }
-/* Class apercu ligne au survol */
- .dataTableRow{background-color: #F0F1F1;height:3em;}
- .dataTableRow:hover,
- .dataTable tr:hover{ background-color: #E6FF99; cursor: pointer; }
- .dataTableRow.Selected,
- .dataTable tr.Selected { background-color: #fff;border-bottom:1px solid #ccc;}
- .dataTableRow td.hierac_enfant {padding-left:0.7em;}
-/* class qui rend element enfant visible au survol de l'element parent*/
- .view.fils {display:none}
- .dataTable tr:hover .view.fils,
- .dataTableRow.Selected .view.fils,
- .view.parent:hover .view.fils{display:block;height:18px}
-/* sort by*/
- .sort_by { clear:both;display:block; text-align:center; width:100%}
- .sort_by .Selected { border-bottom:2px solid red;}
-/* Bouton bas page*/
- .button_nav{clear:both;}
-/* */
- #row_by_page_select option {display:block;}
-
-
-
-/* Structure */
- #header {background:transparent url(img/1/bg_header.jpg) repeat-x ; width:100%; position:fixed; z-index:10;}
- #central { position:relative; top:73px;padding:10px 5px; }
- #central div.box_uniq { width:99%; float:left; }
- #central div.box_left { width:60%; float:left; }
- #central div.box_right { width:39%; float:right; background:#f1f1f1;}
- .configuration #central div.box_right { right:0; width:39%; }
- .configuration #central div.box_right ul{ list-style:none; }
- #bas { margin-top:6em; clear:both; height:25px; background:transparent url(img/1/menu_bg.jpg) repeat-x ;}
- div#footer { clear:both;width:99%; text-align:center;}
-
-
-/* menu Fonctionnement tiroir */
- #menutitre, #menutitre ul { padding:0; margin:0; list-style:none; }
- #menutitre li { position:relative; float:left; width:90px; }
- #menutitre li ul { list-style:none; position:absolute; top:22px; left:0; display:none; z-index:10; }
- #menutitre ul li { float:none; width:180px; }
- #menutitre li:hover ul { display:block; }
- #menutitre a { display:block; padding-top:4px; color:#000; border-right:1px solid #ccc; text-decoration:none; width:90px; height:18px; text-align:center; font:normal 11px Verdana, Arial, sans-serif; }
- #menutitre .disabled, #menutitre .disabled:hover { display:none;}
- #menutitre .disabled ul li a,
- #menutitre .disabled ul li a:hover { display:none; }
- #menutitre a:hover { background-color:#B5CDE8; color:#000; text-decoration:none; }
- #menutitre a.active { background:#B5CDE8; text-decoration:none; }
- #menutitre .ssmenu { margin:0 1px 1px 0; border:1px solid #ccc; background:#eee url(img/1/options_bg.png) 0 0 repeat-y; text-decoration:none; white-space:nowrap; }
- #menutitre li ul.ssmenu li ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li ul.ssmenu{ list-style:none; position:absolute; top:-1px; left:180px; display:none; z-index:15; }
- #menutitre li ul.ssmenu li:hover ul.ssmenu,
- #menutitre li ul.ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
- #menutitre .ssmenu a { color:#000; padding:2px 0px 2px 26px; text-decoration:none; line-height:20px; border:none; border-bottom:1px solid #bebebe; border-top:1px solid #fff; width:154px; text-align:left; }
- #menutitre .ssmenu a:hover { background-color:#fff; color:#000; text-decoration:none; }
- div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
- #ssmenu a { float:left; border:1px solid black; padding:5px 10px 5px 20px; margin:0 1px; }
- #menu_theme * {display:block;}
-
-
-
-/* Habillage */
-
- /* header */
- #headInfos {display:inline-block; height:25px; margin:0; padding:0;}
- #headInfos h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- #headInfos h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
- #headInfos a {padding-left:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;}
- #headInfos a:hover{text-decoration:underline;}
- #menubar{ background:transparent url(img/1/menu_bg.jpg) repeat-x ; height:25px; border-top: 1px solid #fff;}
- /* user bar */
- div#user ul li,
- div#user ul li form { display: inline; }
- div#user select { vertical-align:middle; width:80px; }
- div#user { background:transparent url(img/1/menu_bg.jpg) repeat-x ;border-top: 1px solid #fff; padding-right:10px; height:25px;}
- /* Switcher */
- p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; }
- p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
- /* Bookmark */
- #menubookmark p.themeSwitcher select option,
- #menurecently p.themeSwitcher select#recently_viewed option {display:block;}
-
- /* content */
- #central h3{border-bottom:1px solid black; font-size:17px; font-weight:bold; margin:0 0 10px; padding:0 5px 10px 3px; clear:both; }
- #central h4{font-size:14px; font-weight:bold; padding:20px 5px 10px; clear:both; }
- /* Block formulaire central */
- #central .block_form { -moz-border-radius:6px; -webkit-border-radius:6px; width:99%; margin:0;padding:5px 0.2em 10px 0.2em; display:inline-block; text-align: left; background:#C9C9C9;}
- #central .block_form .tabs_lang{width:98%; float:left;}
- #central .block_form div.tabPage {padding-left:0; padding-right:0;}
- #central form .block_input { -moz-border-radius:6px; -webkit-border-radius:6px; width:98%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px;}
- /* central form .block_input */
- #central form .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
- #central form .block_field { -moz-border-radius:6px; -webkit-border-radius:6px;width:98.9%; margin:2px 0; display:inline-block; text-align: left; padding: 0 5px; border:1px solid #ACAAAC;float:left;background:#DEDADE}
- #central form .block_field.tabs_lang{width:98.9%}
- #central form .block_field.tabs_lang ul.ui-tabs-nav{padding:0; margin:0 -5px;}
- #central form .block_field.tabs_lang ul.ui-tabs-panel{padding:0; margin:0 -5px;}
- #central form .edit.col_right .block_input{width:95%;}
- #central form .edit.col_right .block_input label{width:20%;text-align:left;font-weight:bold}
- #central form .new_product_img { -moz-border-radius:10px; -webkit-border-radius: 10px; border:1px solid #ACAAAC; float:left; padding:5px; margin : 0 100px 5px; }
- #central form fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0px 20px 10px 20px;}
- #central form p input[type="text"] { margin:5px 15px; min-width:200px; }
- #central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
- #central form label { display:inline-block; font-weight:bold; line-height:18px; margin:5px 5px 5px 25px; padding:0 0 2px; text-align:left; width:10%;}
- #central form textarea{ vertical-align:baseline;}
- /* data table */
- .dataTableSearch,
- .dataTable{ width:100%; border-width:0; border-collapse: collapse; background: #fff; }
- .dataTableSearch,
- .dataTable tbody {background-color: #f1f1f1;}
- .dataTableSearch,
- .dataTable thead tr{border-top-color: #FFFFFF; border-bottom-color: #525552; border-left-color: #FFFFFF; border-right-color: #525552; border-style: solid; border-width: 1px;}
- .dataTableSearch,
- .dataTable tr{border:1px solid transparent;cursor:default}
- .dataTableSearch,
- .dataTable th{ height:40px; background-color: #C9C9C9; font-size:1em; font-weight:bold; text-align:center }
- .dataTableSearch,
- .dataTable tr td{ color: #000000;padding: 2px; font-size: 10px;cursor:default}
- .dataTableSearch,
- .dataTable td.row_action { width:150px; text-align:right;}
- .dataTableSearch,
- .dataTable td.row_action_large { width:250px; text-align:right;}
- .dataTableSearch,
- .dataTable td.row_customers { width:250px; text-align:left;}
- /* Block formulaire central block right */
- #central .box_right form .block_input { -moz-border-radius:6px; -webkit-border-radius:6px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;}
- #central .box_right form label {width:20%;text-align:left;font-weight:bold}
- #central .box_right form fieldset .button_nav input[type="text"].block_input {min-width:200; }
-
- /* footer */
- #bas a {padding: 4px 25px;}
- #bas a.oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- #bas a.oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
- #bas a.oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
-
-
-
-
-/* Specifique page diverse */
-
- /* account */
- .formArea { background-color: #f1f9fe; border-color: #7b9ebd; border-style: solid; border-width: 1px; }
- .formAreaTitle { font-family: Tahoma, Verdana, Arial, sans-serif; font-size: 12px; font-weight: bold; }
-
- /* attributes */
- .attributes-odd { background-color: #f4f7fd; }
- .attributes-even { background-color: #ffffff; }
-
-/* info box block droit */
- .infoBoxHeading { background-color:#C9C9C9; border-color:#FFFFFF #525552 #525552 #FFFFFF; border-style:solid; border-width:1px; color:#000000; font-size:12px; font-weight:bold; height:25px; margin-top:-1px; padding:13px 0 0 10px;}
- .infoBoxContent{ border-width: 0px 1px 0px 1px; border-color: #E6E6E6; border-style: solid; padding: 2px 2px 5px 10px; font-size: 10px; color: #000; background-color: #f1f1f1; list-style:none;line-height:1.7em;}
- .infoBoxContent li{clear:both; }
- .infoBoxContent li.ui-state-default {clear:none; }
-
-/* PAge sPECIFIQUE*/
- /* widjet homePage */
- #homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
- #homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
- #homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
- #homestats dl {padding: 5px 0 10px 5px;}
- #homeNews { background:transparent url(../../../images/feed.gif) bottom right no-repeat; }
- #homeNews dl {padding: 5px 0 10px 5px;}
- #homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
- #homeNews dt span.date {font-size:9px; color:gray;}
- #homeNews dd {padding: 3px; margin-bottom: 5px;}
- #homeNews dt a {text-decoration:none; color:#545683;}
- #homeNews dt a:hover {color:#9D9FBF;}
-
- /* statistqiue et rapport*/
- table.dataTable.stat.stock tr {margin:2px; position:relative }
- #central.stats tr.OutofStock{background:#d95017;}
- #central.stats td.OutofStockAttrib {background:#d95017;}
- #central.stats tr.attribute.stock td table{margin-left:10px; width:96%;}
- #central.stats tr.dataTableRow.attribute.stock { border-left:1px solid black; }
- #central.stats table tr table { margin:0; padding:0; border:0; }
-
- /* Module CMS/DESC */
- #central form .cms_desc .block_input { margin : 10px; }
- #central form .cms_desc .block_input p{ line-height : 16px; margin : auto; padding : auto; }
- #central form .cms_desc .block_input h3{ line-height : 20px; border:none; font-size:15px; margin:auto; padding : auto; }
-
- /* Cat list lors edition article ou cms */
- #central #cat_list_in_edit {overflow: auto; max-height: 160px; background-color: #fff; padding: 5px; line-height: 15px; border: 1px solid #666; -moz-border-radius:6px;}
-
- /*--sales stats box --*/
- #salesStats .BarGraph { background: url(img/1/horizontal_line.png) bottom left; border-bottom: 1px solid #333; font: 9px Helvetica, Geneva, sans-serif; height: 50px; width:230px; margin: 1em 1em 2em 1em; padding: 0; position: relative;color:#000;font-weight:bold; }
- #salesStats .BarGraph li { width: 11px; }
- #salesStats .BarGraph li.p0{margin:0 0 -3px 16px;color:#FFF;}
-
-
-/* Widget */
- #customerStats ul{min-height:70px; background:transparent url(img/1/header_stats.png) no-repeat bottom right;}
- #orderStats ul{min-height:70px;background:transparent url(img/1/header_orders.png) no-repeat bottom right;}
- #customerInfos p{min-height:70px;background:transparent url(img/1/header_infos.png) no-repeat bottom right;}
- #salesStats p{float:left;min-height:50px;margin:0 auto;background:transparent url(img/1/header_sales.png) no-repeat bottom right;}
- #orderStats,
- #customerStats,
- #customerInfos { height: 110px; }
- #orderStats ul,
- #customerStats ul,
- #salesStats ul { list-style-type:none; margin:0 0 0 2px; padding:0;}
-
-
-/* Widget BOX */
- #header .adminBlock {width:250px;}
- .adminBlock,.box {float:right;margin:10px;width:95%;background:#e4e4e4 url(../../../images/back.jpg) repeat-x;}
- .adminBlock h3,
- .box h3 { margin: 0;height:15px; background:transparent url(img/1/menu_bg.jpg) repeat-x ; padding:0.3em;border:1px solid #dedede;border-left:1px solid #fff; border-right:1px solid #ccc;color:black;}
- .adminBlock ul,
- .box ul { list-style-type:none; margin:0 0 0 2px; padding:0;}
- .adminBlock .tirroir { clear:both; color:#000; z-index:99;border:1px solid #dedede;border-left:1px solid #fff; border-right:1px solid #ccc;}
-
- #headInfos .adminBlock .tirroir ul,
- #headInfos .adminBlock .tirroir ul li {clear:both;}
- #headInfos .adminBlock .tirroir a,
- #headInfos .adminBlock .tirroir a:hover {clear:both;color:black;}
- .adminBlock h3:hover .tirroir{color:black; }
-
-/* Widget block header admin*/
- .adminBlock {margin:0;}
-
-
-
-/* general Divers */
- #content { margin-top: 2em;}
- div.separator { height:0; margin:0; padding: 0; clear:both; visibility:hidden;}
- .specialPrice { color: #ff0000; }
- .oldPrice { text-decoration: line-through; }
- .fieldRequired { color: #ff0000; }
- .smallText { font-size: 0.8em; }
- .errorText { color: #ff0000; }
- div.editBlock { background-color: #DFDFDF; }
- .block { display:block; background: transparent url(img/1/menu_bg.jpg) repeat-x; border-color:#fff #dedede #dedede #fff; border-style:solid; border-width:1px; color:#000; padding:3px; }
- table.titleTag input { width: 500px; }
- table.descTag textarea ,table.keywordTag textarea { width: 500px;height:100px;}
- td.main img,
- td.smallText img,
- td.infoBoxContent img {vertical-align: baseline;}
-
-
-
-
-
-
-
/* MEnu ADmin Habillage iconne */
a.menuBoxContentLink{ background: transparent url(img/1/configuration.png) 0px 2px no-repeat; text-decoration:none;}
a.menuBoxContentLink.configuration { background-image: url(img/1/configuration.png); }
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 12:47:16 UTC (rev 4554)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 13:27:27 UTC (rev 4555)
@@ -24,6 +24,9 @@
+/* base dimension */
+@display_max_width : 900px;
+@display_width : 90% ;
/* Normal Definition */
@margin: 2%;
@@ -37,9 +40,10 @@
@red: #842210; // Fields required
-/**
- * menu user
- */
+// header block
+@header_base_bg :@color_015 ;
+@header_info_bg : @color_015 ;
+// menu user
@menu_user_bg : #303030;
@menu_user_border : #3F3F3F ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 12:47:22
|
Revision: 4554
http://oscss.svn.sourceforge.net/oscss/?rev=4554&view=rev
Author: oscim
Date: 2012-08-04 12:47:16 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
correction coquille
correction php notice
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Modified: branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php 2012-08-04 08:03:09 UTC (rev 4553)
+++ branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php 2012-08-04 12:47:16 UTC (rev 4554)
@@ -87,14 +87,31 @@
case 'tables':
- $array['fht'] .= " LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=c.content_id AND fht.page_type='content' ) ";
- $array['fhtd'] .= " LEFT JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
+ $array['fht'] = " LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=c.content_id AND fht.page_type='content' ) ";
+ $array['fhtd'] = " LEFT JOIN " . TABLE_FULL_TAG_DESCRIPTION . " fhtd ON( fht.tag_id=fhtd.tag_id AND fhtd.language_id = '".(int)$opt['languages_id']."' ) ";
break;
}
return $array;
}
+ /**
+ @brief format db value for this allfields
+ @param $key string name key
+ @param $item array
+ */
+ public function formatdbvalue($key,$item){
+ global $languages_id;
+
+ switch($key){
+ default:
+ $value = $item[$key] ;
+ }
+
+ return $value;
+ }
+
+
/**
Edition produit
UP db
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 08:03:09 UTC (rev 4553)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 12:47:16 UTC (rev 4554)
@@ -718,6 +718,8 @@
text-align:center;
color: @color_datatable_tr_th_txt;
text-shadow:none;
+ min-height:( @lineheight * 1.6 );
+ height:( @lineheight * 1.6 );
}
}
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 08:03:09 UTC (rev 4553)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-04 12:47:16 UTC (rev 4554)
@@ -166,4 +166,10 @@
// Load generic element and style
@import "../defaut/element.less";
-@import "../defaut/styles.less";
\ No newline at end of file
+@import "../defaut/styles.less";
+
+
+
+body {
+ background:#faf9f7 url("../oscss/img/1/body.jpg") left -80px repeat-x;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 08:03:15
|
Revision: 4553
http://oscss.svn.sourceforge.net/oscss/?rev=4553&view=rev
Author: oscim
Date: 2012-08-04 08:03:09 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
correction et ajustement de coquille dans la prise en charge des tri des listing prive
report du formatage des donn?\195?\169e pour les listing a travers les sous modules
correction css et ajusteemnt du fichier styles.less
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
branches/2.1.1/catalog/admin/includes/modules/pages/featureds.php
branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-08-04 07:45:07 UTC (rev 4552)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php 2012-08-04 08:03:09 UTC (rev 4553)
@@ -266,10 +266,10 @@
}
if(
- ( isset($in_session[$clean]) && (string)$in_session[$clean] == 'on' )
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
|| ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
) {
- $_SESSION['filters']['allfields'][$clean] = 'on';
+ $_SESSION['filters']['allfields'][$alias] = 'on';
/**
@remarks this define col theader title, and ajust html code
*/
@@ -278,7 +278,7 @@
/**
@remarks this define col in table, and if is possible sort
*/
- self::$InitInfo['modele']['listing'][$alias]=true;
+ self::$InitInfo['modele']['listing'][$alias]=((isset($row['sort']) && $row['sort'] == true) ? true : false );
if($clean !=$alias)
$listfield .=$key.' as '.$alias.',';
@@ -716,9 +716,19 @@
/* END Sub module add col */
$query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : '').
- " GROUP BY c.content_id ".
- " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' c.date_added DESC ');
+ " GROUP BY c.content_id ";
+ /* DEB Sub module add table */
+ $r = self::$modules->__call('GetConf', array('languages_id'=>(int)$adjust->languages_id, 'type'=>'group_by')) ;
+ foreach($r as $mod=>$value){
+ foreach($value as $key=>$string){
+ $query_raw .= $string;
+ }
+ }
+ /* END Sub module add col */
+
+ $query_raw .=" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' c.date_added DESC ');
+
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-04 07:45:07 UTC (rev 4552)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-04 08:03:09 UTC (rev 4553)
@@ -300,10 +300,10 @@
}
if(
- ( isset($in_session[$clean]) && (string)$in_session[$clean] == 'on' )
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
|| ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
) {
- $_SESSION['filters']['allfields'][$clean] = 'on';
+ $_SESSION['filters']['allfields'][$alias] = 'on';
/**
@remarks this define col theader title, and ajust html code
*/
@@ -312,7 +312,7 @@
/**
@remarks this define col in table, and if is possible sort
*/
- self::$InitInfo['modele']['listing'][$alias]=true;
+ self::$InitInfo['modele']['listing'][$alias]=((isset($row['sort']) && $row['sort'] == true) ? true : false );
if($clean !=$alias)
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/featureds.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/featureds.php 2012-08-04 07:45:07 UTC (rev 4552)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/featureds.php 2012-08-04 08:03:09 UTC (rev 4553)
@@ -222,10 +222,10 @@
if(
- ( isset($in_session[$clean]) && (string)$in_session[$clean] == 'on' )
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
|| ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
) {
- $_SESSION['filters']['allfields'][$clean] = 'on';
+ $_SESSION['filters']['allfields'][$alias] = 'on';
/**
@remarks this define col theader title, and ajust html code
*/
@@ -234,7 +234,7 @@
/**
@remarks this define col in table, and if is possible sort
*/
- self::$InitInfo['modele']['listing'][$alias]=true;
+ self::$InitInfo['modele']['listing'][$alias]=((isset($row['sort']) && $row['sort'] == true) ? true : false );
if($clean !=$alias)
$listfield .=$key.' as '.$alias.',';
Modified: branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php 2012-08-04 07:45:07 UTC (rev 4552)
+++ branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php 2012-08-04 08:03:09 UTC (rev 4553)
@@ -105,6 +105,25 @@
return $array;
}
+
+ /**
+ @brief format db value for this allfields
+ @param $key string name key
+ @param $item array
+ */
+ public function formatdbvalue($key,$item){
+ global $languages_id;
+
+ switch($key){
+ default:
+ $value = $item[$key] ;
+ }
+
+ return $value;
+ }
+
+
+
/**
Edition produit
UP db
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 07:45:07 UTC (rev 4552)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 08:03:09 UTC (rev 4553)
@@ -77,8 +77,9 @@
th {
margin:2px 1px;
text-align: left;
- padding: 0 @padding_base;
- line-height:(@lineheight * 2);
+ padding: 2px @padding_base;
+ height:@lineheight;
+ line-height:(@lineheight * 0.7);
}
input,
@@ -1191,7 +1192,7 @@
margin:0;
background:#eee;
height:(@lineheight * 1.3);
- line-height:(@lineheight * 1.3);
+ line-height:(@lineheight * 0.5);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-04 07:45:14
|
Revision: 4552
http://oscss.svn.sourceforge.net/oscss/?rev=4552&view=rev
Author: oscim
Date: 2012-08-04 07:45:07 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
centralisation structure css de base dans le theme par defaut du BO
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
Added: branches/2.1.1/catalog/admin/includes/template/defaut/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/styles.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/styles.less 2012-08-04 07:45:07 UTC (rev 4552)
@@ -0,0 +1,1446 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* Mixin */
+
+.wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+}
+
+/**
+ * Reto-compatibilte oscommerce oscss < 2.xx
+ */
+/* info box block droit */
+.infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+}
+.infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+}
+.infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+/* Generalite */
+
+
+*{
+ margin:0;
+ padding:0;
+ text-shadow:none;
+ border:0;
+}
+a :link,
+a:visited {text-decoration: underline; color:#000;}
+a:hover { text-decoration: none; }
+img { border:0 ; margin:0; padding:0; }
+h1 { font-size:(@font_size * 1) ; padding:(@padding_base * 2); }
+h2 { font-size:(@font_size * 1.2) ;}
+h3 {
+ clear:both;
+ color: @title_h3_color;
+ font-size: (@font_size * 1.9);
+ font-weight: bold;
+ padding: @padding_base 0 @padding_base (@padding_base * 1.2);
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
+}
+h4 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+h5 { font-size: @font_size ;text-shadow:0 1px 0 #fff;}
+p {padding:1em;}
+ul {list-style:none;}
+th {
+ margin:2px 1px;
+ text-align: left;
+ padding: 0 @padding_base;
+ line-height:(@lineheight * 2);
+}
+
+input,
+select,
+textarea,
+button {
+ padding:(@padding_base * 0.3) ;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
+ border:1px solid @bg_input_border;
+ background: @bg_input ;
+ .border-radius(5px);
+ .rounded(5px);
+
+ &:hover{
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+}
+
+
+/* general class */
+.error{ color:@field_required; }
+.alert{ color:#ae0405; }
+.fright{ float:right; }
+.fleft {float:left; }
+.tleft{text-align:left}
+.tright{text-align:right}
+.tcenter{text-align:center}
+.inline ,
+.inline *,
+div#central .inline *{ display:inline-block; }
+.nobr {white-space:nowrap;}
+
+.w_100 {width:99%;}
+.w_90 {width:89%;}
+.w_80 {width:79%;}
+.w_70 {width:69%;}
+.w_60 {width:59%;}
+.w_50 {width:49%;}
+.w_40 {width:39%;}
+.w_30 {width:29%;}
+.padd_w {padding-left:(@padding_base * 0.2); padding-right:(@padding_base * 0.2);}
+.padd_h {padding-top:(@padding_base * 0.2); padding-bottom:(@padding_base * 0.2);}
+.linkdoc {font-size:@font_size; font-weight:bold; }
+.spacer {clear:both;}
+.fieldRequired { color: @field_required; }
+.smallText { font-size: (@font_size * 0.8); }
+.errorText { color: @field_required; }
+
+
+/* --- message box --- */
+.messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
+.messageStack{ font-family: Verdana, Arial, sans-serif;}
+.messageStack li{padding:(@padding_base * 0.2);}
+.messageStackError,
+.messageStackWarning { background:@color_warning;}
+.messageStackSuccess { background:@color_success; }
+.messageStackNotice { background:@color_notice;}
+
+/* toogle item complet js action */
+h4.Ctrtirroir,
+h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 (@padding_base * 2); font-size: (@font_size * 1.1); }
+.Ctrtirroir {
+ background:transparent url('../../../images/icons/icon_down.gif') left top no-repeat;
+ padding-left:(@padding_base * 2);
+ height:@lineheight;
+}
+.Ctrtirroir.closed {background:transparent url('../../../images/icons/icon_arrow_right.gif') left top no-repeat; }
+fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
+
+
+
+
+
+
+
+
+
+
+
+body {
+ background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background-attachment:fixed;
+ font: normal @font_size Verdana, Arial, sans-serif;
+}
+
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ background:transparent ;
+ height:(@lineheight * 1.55);
+ border-top: 1px solid @nav_border;
+
+ a,
+ a:link,
+ a:visited {
+ color: @nav_master_link;
+ text-decoration: none;
+ text-shadow:none;
+ }
+
+ a {
+ display:block;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal @font_size Verdana, Arial, sans-serif;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+
+ &:link,
+ &:visited {
+ color:@nav_master_link;
+ }
+
+ &:hover {
+ color:@nav_master_link_hover;
+ text-shadow: 0 1px 0 @nav_master_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color: @submenu_link;
+ padding:(@padding_base * 0.2) 0 (@padding_base * 0.2) (@padding_base * 0.4);
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+ text-align:left;
+
+ &:hover {
+ background-color:@submenu_bg_hover;
+ color:@submenu_link_hover ;
+ text-shadow: 0 1px 0 @submenu_link_hover_shadow;
+ text-decoration:none;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:@submenu_bg;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul { display:block; }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+ }
+
+ ul.fleft{
+ .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:@color_011;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+
+ option{
+ display:block;
+ color:@color_013;
+ font-size:(@font_size *0.9);
+ }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ background:@menu_user_bg ;
+ border-top: 1px solid @menu_user_border;
+ padding-right:10px;
+ height:25px;
+
+ ul#MenuExts{
+
+ li{
+ position:relative;
+ float:left;
+ background: none repeat-x scroll 0 0 @color_bg_menuexts;
+ height: 25px;
+ padding: 0 8px;
+
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:( @lineheight * 1.3);
+ text-align:center;
+ color:@color_011;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+}
+
+
+
+/**
+ * Structure base html
+ * no specific forms (cf section forms )
+ */
+
+.configuration{
+ div#central{
+
+ div#ssmenu{
+ display: block;
+ height: ( @lineheight * 1.5);
+ line-height: ( @lineheight * 1.5);
+ padding: 5px 10px;
+ width: 100%;
+ }
+
+ div.box_right {
+ right:0;
+ width:39%;
+
+ ul{ list-style:none; }
+ }
+ }
+}
+
+// .page {
+ // div#central{
+ // }
+ // }
+
+ div#glob {
+ width:100%;
+ z-index:10;
+ height:100%;
+
+ header#header {
+ background:black;
+ min-width:900px;
+ width:90%;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:25px;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:@color_011;
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+ h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:@color_011; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+ }
+
+ div#central{
+ position:relative;
+ padding:10px 5px;
+ top:79px;
+ margin-bottom: 79px;
+ border-left: 1px solid black;
+ border-right: 1px solid black;
+ border-bottom: 1px solid black;
+ background:@color_011;
+
+ div.box_uniq {
+ width:100%;
+ float:left;
+ padding: 0;
+ background:none;
+ }
+
+ div.box_left { width:60%; float:left; }
+
+ div.box_right {
+ width:39%;
+ float:right;
+ }
+
+ h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ }
+
+ }
+
+ div#center,
+ div#bas {
+ margin: 0 auto;
+ position: relative;
+ min-width:900px;
+ width:90%;
+ }
+
+ div#bas {
+ // margin-top:8em;
+ clear:both;
+ height:25px;
+ background:@color_013;
+ color:@color_011;
+
+ a,
+ a:link,
+ a:visited {
+ text-shadow : none;
+ padding: 4px 25px;
+ color:@color_011;
+ }
+
+ // logo link partenaires
+ .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+ .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+ .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
+ }
+ footer {
+ background: #505050;
+ clear:both;width:100%;
+ text-align:center;
+ color:@color_011;
+
+ a,
+ a:link,
+ a:visited {
+ color:@color_011;
+ text-decoration: none;
+
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+
+
+
+
+ /**
+ * Bouton
+ */
+ .button,
+ select.button,
+ input[type=submit].button,
+ input[type=button].button,
+ button.button,
+ a.button{
+ display: inline-block;
+ font-family:Arial;
+ white-space:nowrap;
+ float:right;
+ color:@color_011;
+ vertical-align:middle;
+ border:1px solid #fff;
+ height: ( @lineheight * 1.6);
+ line-height: 25px;
+ margin:8px 20px;
+ text-shadow: none;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+ input[type=image].button {
+ float:left;
+ height:( @lineheight * 1.3);
+ width:18px;
+ }
+
+ input.button,
+ button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
+
+
+ a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none; height:( @lineheight * 1.3) ; line-height:( @lineheight * 1.3);}
+ a.button:hover{color:@color_011;text-decoration:none; }
+
+ a.button,
+ select.button,
+ input.button,
+ button.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
+ }
+
+ a.button.ActionYes,
+ input.button.ActionYes,
+ input[type=image].button.ActionYes,
+ input[type=submit].button.ActionYes,
+ button.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
+ }
+
+ a.button.ActionBack,
+ input[type=image].button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+
+ input:hover.button,
+ button:hover.button{background:#797979;color:@color_011;}
+
+ a:hover.button,
+ input:hover.button,
+ button:hover.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
+ opacity:0.6;
+ }
+
+ a:hover.button.ActionYes,
+ input:hover.button.ActionYes,
+ button:hover.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
+ color:black;
+ }
+
+ a.button.ActionBack,
+ input.button.ActionBack,
+ button.button.ActionBack {
+ color:@color_011;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
+ }
+
+ a:hover.button.ActionBack,
+ input:hover.button.ActionBack,
+ button:hover.button.ActionBack {
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+ input[type=image].button,
+ a.buttonimg img{ opacity:1;}
+
+ input[type=image]:hover.button ,
+ a:hover.buttonimg img,
+ a.buttonimg img:hover{ opacity:0.6;}
+
+ /* Spe buttons broswer img */
+ a.button.browser {height:24px;}
+ a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+ .row_action a.button {margin:0;}
+
+
+ /* Block html content all bouton */
+ .button_nav{
+ clear:both;
+
+ form{
+ float:right;
+ width:100px;
+
+ p {margin:0;padding:0;}
+ }
+ }
+
+
+ /**
+ * Section for block widget in dashbord
+ */
+ .widget{
+ float: left;
+ margin: @margin;
+ width: (100% - (@margin * 1) );
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ h3 {
+ color: @color_widget_title;
+ clear: both;
+ margin-bottom:@margin;
+ padding:5px 0 5px 5px;
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+
+ a{
+ color: @color_widget_title;
+ text-decoration:none;
+
+ &:hover{
+ color: gray;
+ }
+ }
+ }
+
+ ol {padding-left:25px;}
+
+ .dataTableBase tr{
+ background-color: #F0F0F0;
+
+ th {
+ height: 20px;
+ line-height: 20px;
+ background : @color_widget_bg_th;
+ }
+
+ &:nth-child(odd) {
+ background-color: #D7D7D7;
+ }
+
+ a{
+ font-weight : bold;
+ color: @color_widget_bg_th;
+ }
+ }
+
+
+ /* sous menu en widget , specifique page conf et dashboard configuration */
+ div#ssmenu{
+ a {
+ background: none repeat scroll 0 0 #797979;
+ border-right: 1px solid #444444;
+ clear: both;
+ color: @color_011;
+ font-size: @font_size;
+ margin: 0 0 1px 25px;
+ padding: 5px 10px;
+ text-shadow: 0 1px 0 #000000;
+ width: 40%;
+
+ &:hover {
+ float:left;
+ margin:0;
+ background:#eee;
+ color:#000;
+ text-shadow: 0 1px 0 #fff;
+ }
+ }
+ }
+ }
+
+
+ .edit{
+ background:#eee;
+ background-attachment:none;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+
+ /**
+ * Dipslay all listing in array
+ */
+ .dataTableBase,
+ .dataTableSearch,
+ .dataTable{
+ width:100%;
+ border-width:0;
+ border:1px solid @color_012;
+ .rounded(5px);
+
+ a.button,
+ input[type=submit].button,
+ input[type=image].button,
+ button.button {
+ margin:0;
+ }
+
+
+ tr {
+ padding:0;
+ margin:0;
+
+ th{
+ background-color: @color_datatable_tr_th;
+ font-size:@font_size;
+ font-weight:bold;
+ text-align:center;
+ color: @color_datatable_tr_th_txt;
+ text-shadow:none;
+ }
+ }
+
+
+ tbody{
+
+ // rollover rows for mouse
+ tr.odd,
+ tr.even{
+ border:none;
+ cursor:default;
+
+ &:hover{
+ background-color: @bg_hover;
+ cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
+ }
+
+ td{
+ line-height:( @lineheight * 1.1 );
+ color: @datatable_color_txt;
+ padding: 2px;
+ font-size: @font_size;
+ cursor:default;
+
+ a{
+ text-decoration:none;
+ color: @datatable_color_txt;
+ }
+
+ /* Replace value by icon */
+ .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+
+ .edit-input-value .Flag-0.txt,
+ .edit-input-value .Val-0.txt { display:none}
+ .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
+ .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
+
+ .edit-input-value .Flag-1.txt,
+ .edit-input-value .Val-1.txt { display:none}
+ .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
+ .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
+ }
+ .row_action {
+ min-width:100px;
+ text-align:right;
+ }
+
+ .row_action_large {
+ min-width:250px;
+ text-align:right;
+ }
+
+ .row_customers {
+ min-width:100px;
+ text-align:left;
+ }
+
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
+ }
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
+ }
+
+ .sorting_2{
+ background-color:( @color_sorting + 65);
+ }
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 65);
+ }
+
+ .sorting_3{
+ background-color:( @color_sorting + 80);
+ }
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 80);
+ }
+
+
+ }
+
+ .odd{
+ background-color: @bg_table_tr_odd;
+ }
+
+ .even{
+ background-color: @bg_table_tr_even;
+ }
+ }
+
+ tfoot tr td input {width:80%;text-align:left;}
+ }
+
+
+ .dataTables_wrapper {
+ min-height:200px;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .paging_full_numbers{
+
+ .paginate_button,
+ .paginate_active{
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .paginate_active{
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
+ }
+
+ .top{
+ padding: 1px 10px;
+ .border-radius( 5px,0, 0, 5px);
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ margin-bottom: 5px;
+ }
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+ }
+
+ .bottom {
+ padding: 5px 10px;
+ .border-radius( 0, 5px, 5px, 0);
+
+ .TableTools {
+ margin: 0 0 5px 0;
+ padding:0;
+ height:34px;
+ }
+
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ }
+ }
+
+ /**
+ * class qui rend element enfant visible au survol de l'element parent
+ */
+ .view.fils {display:none}
+ .dataTableBase tr:hover .view.fils,
+ .dataTable tr:hover .view.fils,
+ .dataTableRow.Selected .view.fils,
+ .view.parent:hover .view.fils{display:block;height:13px}
+
+
+
+
+ /**
+ * Listing Filter for Datatable
+ */
+ div#central form#filters {
+ padding:0;
+ margin: 0 1em;
+ width:98%;
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ p.Ctrtirroir {
+ padding: 2px 10px 2px 20px;
+ font-size:(@font_size*1.2);
+ width:95.2%;
+ color: #000000;
+ font-weight: bold;
+
+ &:hover {
+ background-color: @bg_hover;
+ cursor:pointer;
+ }
+ }
+
+ div#filtre {
+ padding:0;
+ border:1px solid #AAAAAA;
+ background: transparent;
+
+ ul.ui-tabs-nav {
+ width:99.6%;
+
+ li{
+ line-height:1em;
+ width:auto;
+ }
+ }
+ }
+
+ fieldset label{width:auto;}
+
+ li.select{
+ color : @color_tab_text_selected ;
+ }
+ }
+
+
+
+ /**
+ * Forms
+ */
+ fieldset {
+ margin: 0.3em ;
+ padding:0.3em;
+ border:none;
+
+ p {
+ margin: 0.3em;
+ padding:0.3em;
+ }
+
+ select,
+ input[type="text"] { min-width:62%; display:inline-block;}
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ input.radioInput {width:30px;}
+
+ div#form_bt { width: 80%; margin: 1em 2em;}
+ ul.form_radio_inline{display:inline-block;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
+ .color_type {display: inline-block; padding: 6px 0 6px 5px;background: none repeat scroll 0 0 transparent;}
+
+
+ // master central display
+ div#central form{
+ padding:0.5em 1em;
+
+ label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+
+ fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+
+ textarea{ vertical-align:baseline;}
+
+ p{
+
+ input[type="checkbox"] { float:right; }
+
+ select,
+ input[type="text"] {
+ margin:5px 15px;
+ }
+ select{
+ padding:1px 0 0 0;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
+ p.new_product_img {
+ float:left;
+ padding:5px;
+ margin : 0 auto;
+ text-align:center;
+ width:98%;
+ border:1px solid @color_012;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ margin:auto;
+ max-width: 300px;
+ }
+ }
+
+
+ ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
+
+ .block_form {
+ .block_input{
+ text-shadow:0 1px 0 #fff;
+ width:94.9%;
+ margin:2px 1px;
+ display:inline-block;
+ text-align: left;
+ background:#C9C9C9;
+ float:left;
+ line-height:18px;
+ padding:5px 5px 10px 5px;
+ border:1px solid @color_014;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+
+
+ span.value_edit {clear:both;display:inline-block; width:100%;}
+
+ br,
+ span.value_edit br{display:none;}
+
+ label br {display:inline-block;}
+
+ span.edit-input,
+ span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
+ span.edit-input{
+ white-space:nowrap;
+
+ input{float: left;}
+
+ .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+ .edit-input-value {padding-left:12px;}
+ /* remplacement true /false par icone */
+ .edit-input-value.Val-true ,
+ .edit-input-value.Val-false {font-size:0;}
+ .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
+ .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
+ }
+ }
+
+ .block_input.tirroir {float:none;}
+
+ .tabs_lang{width:98.5%; float:left;}
+ }
+
+ .block_field {
+ text-shadow:0 1px 0 #fff;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px;
+ float:left;
+
+ .tabs,
+ .tabs_lang{
+ width:96.5%;
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
+ float:left;
+ }
+
+ .tabs_lang ul.ui-tabs-nav,
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
+ }
+
+ .block_input label.inline { white-space:nowrap; width: 20%;}
+
+ .edit.col_right .block_input{
+ width:95%;
+
+ label{width:20%;text-align:left;font-weight:bold}
+ }
+
+ .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+
+ .input-multi input[type="checkbox"],
+ .input-multi input[type="radio"]{float:none;}
+
+
+ }
+
+ div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+
+ /* Select Categorie */
+ div#central #CurrentPathSelect *,
+ div#central #CurrentPathSelect form {
+ margin:@margin 0;
+ padding:0;
+ width:100%;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ select#cPath {
+ margin:0;
+ font-size:(@font_size * 1.3);
+ color:black;
+ font-weight:bold;
+ padding:0.2em 0.6em;
+ height: (@lineheight * 1.8) ;
+
+ &:hover {background-color: @bg_hover;cursor:pointer; }
+
+ option {
+ margin:0;
+ background-color:#f5f5f5;
+ }
+ }
+ }
+
+
+ /**
+ * Section specific Orders page
+ */
+ .main-orders{
+ fieldset{
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .box_uniq.block_form{
+ fieldset{
+ margin:1% 2%;
+ padding:0 1%;
+ }
+
+ .w_50 {
+ width:44%;
+ }
+ }
+
+ block_input{
+ br,
+ span.value_edit br{display:block;height:0;}
+ }
+
+ table.main-orders {
+ margin:1%;
+ width:98%;
+
+ thead tr th{
+ background:@color_013;
+ color:@color_011;
+ font-weight: normal;
+ text-shadow: none;
+ }
+
+ tr th{
+ margin:0;
+ background:#eee;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
+
+ .block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ }
+ }
+
+ /* Ajsutement customer page */
+ div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+
+
+ /**
+ * External - plugin - others
+ */
+ div#fancybox-outer {
+ background:none;
+ border:none !important;
+
+ div#fancybox-content {
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+
+ h3{
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ }
+ }
+ /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
+ div#fancybox-inner{
+ h3 {
+ color:@color_title_txt;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+
+ form {
+ float:left;
+ position: relative;
+ top:20px;
+ padding: 0 0 30px;
+ margin:0 0 30px 0;
+
+ h3{ top: -25px;}
+
+ fieldset {
+ margin: 5px;
+ padding:5pxem;
+ border:none;
+
+ label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
+
+ select,
+ input[type="text"] { min-width:65%; display:inline-block;float:right;}
+
+ .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
+ }
+ }
+ }
+ // UI
+ /* Layout helpers */
+ .ui-dialog {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-dialog-content{
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
+ .ui-helper-hidden { display: none; }
+ .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: (@lineheight * 0.9); text-decoration: none; font-size: @font_size; list-style: none; }
+ .ui-helper-clearfix {
+ zoom: 1;
+
+ &:before,
+ &:after { content: ""; display: table; }
+ &:after { clear: both; }
+ }
+ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+ /* Interaction states */
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ font-weight: normal;
+ color: @color_tab_text_default;
+ text-shadow : 0 1px 0 @color_tab_text_default_shadow;
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover,
+ .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
+ border-bottom:2px solid @color_tabs_cl_1;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
+ font-weight: normal;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_hover;
+ text-decoration: none;
+ text-shadow : 0 1px 0 @color_tab_text_hover_shadow;
+ }
+ }
+
+ .ui-state-hover a,
+ .ui-state-hover a:hover {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: 1px solid (@color_bg_gradient_base - 50);
+ .bw-gradient( @color_bg_gradient_base, @color_bg_gradient_eob, @color_bg_gradient_eon);
+ font-weight: normal;
+ color: @color_tab_text_selected;
+ border-bottom: 0 !important;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+ }
+ }
+
+
+ .ui-widget :active { outline: none; }
+
+ // UI generic
+ .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size * 1.1);
+
+ .ui-widget { font-size: @font_size; }
+
+ }
+
+
+ .ui-widget-header {
+ border-radius: 0;
+ border-bottom: 1px solid #aaaaaa;
+ font-weight: bold;
+ }
+
+
+
+ // UI tabs
+ .ui-tabs {
+ position: relative;
+ padding: .2em;
+ zoom: 1;
+
+ .ui-tabs-nav {
+ margin: 0;
+ padding: 0;
+
+ li {
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 1px;
+ margin: 0 .1em 0 0;
+ padding: 0;
+ white-space: nowrap;
+
+ a {
+ float: left;
+ padding: .3em 0.5em;
+ text-decoration: none;
+ cursor: pointer;
+ font-size: (@font_size*1.3);
+ font-weight : bold;
+ }
+ }
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ cursor: not-drop;
+ }
+ .ui-tabs-selected,
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a {
+ cursor: not-allowed !important;
+ text-shadow : 0 1px 0 @color_tab_text_selected_shadow;
+ }
+ }
+
+ .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
+
+ .ui-tabs-panel { display: block; border-width: 0; padding: (@padding_base * 0.1); background: none; }
+
+ .ui-tabs-hide { display: none !important; }
+
+ div.box_uniq { width:99%; }
+ }
+
+
+
+
+
+
+
+ // Toolips
+ .tooltip{
+ position:absolute;
+ z-index:999;
+ left:-9999px;
+ background-color:#dedede;
+ padding:5px;
+ border:1px solid #fff;
+ width:250px;
+
+ p{
+ margin:0;
+ padding:0;
+ color:#fff;
+ background-color:#222;
+ padding:(@padding_base * 0.1) (@padding_base * 0.5);
+ }
+ }
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-03 22:19:59
|
Revision: 4551
http://oscss.svn.sourceforge.net/oscss/?rev=4551&view=rev
Author: oscim
Date: 2012-08-03 22:19:52 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
correction coquile
petite amelioration souplesse lors injection de colonne dans les listing du BO
implementation de la prise en charge des extras dans les listing a travers le module products_extra qui ajout touts les champs extra
correction dans la prise en charge de l'alias dans le filter
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php
branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php 2012-08-03 18:25:18 UTC (rev 4550)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php 2012-08-03 22:19:52 UTC (rev 4551)
@@ -84,7 +84,7 @@
if ( (( isset($attrs['flag']) && isset($module->$attrs['flag']) && (bool)$module->$attrs['flag']) || !isset($attrs['flag'])) /// control flag
and (method_exists($module, $method )) /// control presence method
)
- $r[]=$this->modules[$key]->$method($attrs);
+ $r[$key]=$this->modules[$key]->$method($attrs);
}
return $r;
Modified: branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php 2012-08-03 18:25:18 UTC (rev 4550)
+++ branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php 2012-08-03 22:19:52 UTC (rev 4551)
@@ -140,7 +140,8 @@
if(is_dir($path) && self::TestFile($path.$name_object.'/oscss_init.php') ) {
include_once($path.$name_object.'/oscss_init.php');
$this->add_obj($name_object.'_oscss');
- } else die(_('Error extenion introuvable'));
+ }
+ else die(__('Error extention editeur introuvable'));
}
Modified: branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab 2012-08-03 18:25:18 UTC (rev 4550)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab 2012-08-03 22:19:52 UTC (rev 4551)
@@ -14,9 +14,9 @@
<legend><?php echo __('@filters filter legend choose fields'); ?></legend>
<ul class="inline">
<?php foreach(MGabCont::CallSt('DFilterAllfields') as $k=>$item):
- $clean = substr($k, (strpos($k, '.')+1)); ?>
- <li class="<?php echo ((bool)(count($_SESSION['filters']['allfields']) <=1 || (string)@$_SESSION['filters']['allfields'][$clean] == 'on')? 'select' : '' ) ?>">
- <?php echo tep_draw_checkbox_field('filters[listfield]['.$clean.']', 'filters[listfield]['.$clean.']', 'on', (bool)(count($_SESSION['filters']['allfields']) <=1 || (string)@$_SESSION['filters']['allfields'][$clean] == 'on')); ?>
+ $clean = substr($k, (strpos($k, '.')+1)); $alias = (isset($item['alias'])? $item['alias'] : $clean); ?>
+ <li class="<?php echo ((bool)(count($_SESSION['filters']['allfields']) <=1 || (string)@$_SESSION['filters']['allfields'][$alias] == 'on')? 'select' : '' ) ?>">
+ <?php echo tep_draw_checkbox_field('filters[listfield]['.$alias.']', 'filters[listfield]['.$alias.']', 'on', (bool)(count($_SESSION['filters']['allfields']) <=1 || (string)@$_SESSION['filters']['allfields'][$alias] == 'on')); ?>
<?php echo (is_array($item)? $item['text'] : $item ) ?>
</li>
<?php endforeach; ?>
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-03 18:25:18 UTC (rev 4550)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-03 22:19:52 UTC (rev 4551)
@@ -92,8 +92,11 @@
@var array info all tabs for filter listings
*/
public static $allfields = array();
-
/**
+ @var array info all tabs for filter listings , specifical owner sub module
+ */
+ protected static $allfieldsexternal = array();
+ /**
@brief constructor
*/
public function __construct(){
@@ -175,6 +178,7 @@
self::$allfields = array(
'p.products_id' => array(
'sort'=>true,
+ 'search'=>true,
'alias'=>'id',
'text'=>__('products table heading id'),
'width'=>'2%',
@@ -306,9 +310,13 @@
/* DEB Sub module add col */
$r = self::$modules->__call('GetConf', array('type'=>'allfields')) ;
+
foreach($r as $mod=>$value){
foreach($value as $key=>$array){
self::$allfields[$key] = $array;
+
+ self::$allfieldsexternal[$key] = $array;
+ self::$allfieldsexternal[$key]['module'] = $mod;
}
}
/* END Sub module add col */
@@ -365,10 +373,10 @@
}
if(
- ( isset($in_session[$clean]) && (string)$in_session[$clean] == 'on' )
+ ( isset($in_session[$alias]) && (string)$in_session[$alias] == 'on' )
|| ( count($in_session) <=1 && ( is_array($row) && isset($row['default']) && $row['default'] == true) )
) {
- $_SESSION['filters']['allfields'][$clean] = 'on';
+ $_SESSION['filters']['allfields'][$alias] = 'on';
/**
@remarks this define col theader title, and ajust html code
*/
@@ -377,7 +385,7 @@
/**
@remarks this define col in table, and if is possible sort
*/
- self::$InitInfo['modele']['listing'][$alias]=true;
+ self::$InitInfo['modele']['listing'][$alias]= ((isset($row['sort']) && $row['sort'] == true) ? true : false );
if($clean !=$alias)
$listfield .=$key.' as '.$alias.',';
@@ -992,9 +1000,19 @@
/* END Sub module add col */
$query_raw .=((strlen($adjust->sWhere)>4) ? " WHERE ".substr($adjust->sWhere, 3) : '').
- " GROUP BY p.products_id ".
- " ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' p.products_date_added DESC ');
+ " GROUP BY p.products_id ";
+ /* DEB Sub module add table */
+ $r = self::$modules->__call('GetConf', array('languages_id'=>(int)$adjust->languages_id, 'type'=>'group_by')) ;
+ foreach($r as $mod=>$value){
+ foreach($value as $key=>$string){
+ $query_raw .= $string;
+ }
+ }
+ /* END Sub module add col */
+
+ $query_raw .=" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : ' p.products_date_added DESC ');
+// echo $query_raw;
$_split = new splitPageResults($adjust->page, $adjust->rowbyp, $query_raw, $query_numrows);
$_query = $DB->query($query_raw);
@@ -1215,6 +1233,17 @@
case 'listing':
global $query_numrows,$languages_id;
+
+ /* DEB Sub module add col */
+ $external = array();
+ foreach(self::$allfieldsexternal as $key => $value ){
+ $clean = substr($key, (strpos($key, '.')+1));
+ $alias = (isset($value['alias'])? $value['alias'] : $clean);
+ $external[] = $alias;
+ $process[$alias] = $value['module'];
+ }
+ /* END Sub module add col */
+
while ($item = $_query->fetchAssoc()) {
$ord =array();
@@ -1242,6 +1271,7 @@
}
+
$item[1]=tep_draw_checkbox_field('action_multi['.$item['id'].']','action_mutli_'.$item['id'],$item['id']);
foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
@@ -1250,7 +1280,12 @@
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
// elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
elseif(in_array($k , array('added', 'modified' ,'available')) ) $ord[$k]=tep_date_short($item[$k]);
-
+ /* DEB Sub module add col */
+ elseif( in_array($k, $external) ){
+ $class = self::$modules->modules[$process[$k]];
+ $ord[$k]= $class->formatdbvalue($k, $item);
+ }
+ /* END Sub module add col */
else $ord[$k]=$item[$k];
}
Modified: branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php 2012-08-03 18:25:18 UTC (rev 4550)
+++ branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php 2012-08-03 22:19:52 UTC (rev 4551)
@@ -44,7 +44,84 @@
}
+ /**
+ @brief Load , adjust and define var environement GetConf master module
+ @param $opt array
+ type => '' string name type for define return
+ languages_id => '' int
+ */
+ public function GetConf($opt){
+ $array = array();
+ global $languages_id;
+
+ /// create cache for speed load page
+ $osCSS_Cache = new osCSS_Cache();
+ if ($osCSS_Cache->read('product-'.MGabCont::CallSt('GetClassDatatype').'-'.__CLASS__.'-' . $languages_id.'-type', 720))
+ $epf = $osCSS_Cache->getCache();
+ else {
+ $languages = tep_get_languages();
+ $epf_query = tep_db_query($sql="select e.epf_id, e.epf_uses_value_list, e.epf_show_parent_chain, e.epf_size,e.epf_key, l.epf_label, l.languages_id, l.epf_active_for_language, l.epf_label_help from " . TABLE_PRODUCTS_EXTRA_FIELDS . " e join " . TABLE_PRODUCTS_EXTRA_FIELDS_LABELS . " l where e.epf_status and e.epf_special_mod='' and l.languages_id='".(int)$languages_id."' and (e.epf_id = l.epf_id) order by e.epf_order");
+
+ $epf = $epf_query->fetchAllAssoc();
+ $res= $osCSS_Cache->writeBuffer($epf);
+ }
+
+
+
+ switch ($opt['type']) {
+ case 'allfields':
+
+ foreach($epf as $e){
+ $array['epf2pp'.$e['epf_id'].'.products_extra_fields_id'] = array(
+ 'sort'=>false,
+ 'alias'=>$e['epf_key'],
+ 'text'=>$e['epf_label'],
+// 'width'=>'8%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ }
+
+ break;
+
+ case 'tables':
+
+ global $languages_id;
+
+
+ foreach($epf as $e){
+ $array['epf2pp'.$e['epf_id']] = " LEFT JOIN " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " epf2pp".$e['epf_id']." ON( epf2pp".$e['epf_id'].".products_id=p.products_id AND epf2pp".$e['epf_id'].".products_extra_fields_id = '".$e['epf_id']."' ) ";
+ }
+
+ break;
+
+
+
+ }
+ return $array;
+ }
+
+
+
+ /**
+ @brief format db value for this allfields
+ @param $key string name key
+ @param $item array
+ */
+ public function formatdbvalue($key,$item){
+ global $languages_id;
+
+ switch($key){
+ // extra
+ default:
+ $value = tep_get_product_extra_value((string)$key , (int)$item['id'] , $languages_id);
+ }
+
+ return $value;
+ }
+
+
public function delete_account ($id){
$extra_fields_query = tep_db_query("select ce.epf_id as id, epf_input_type as type, epf_active_value_language as active_value_language from " . TABLE_PRODUCTS_EXTRA_FIELDS . " ce where ce.epf_status=1 AND epf_special_mod='' ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-03 18:25:24
|
Revision: 4550
http://oscss.svn.sourceforge.net/oscss/?rev=4550&view=rev
Author: oscim
Date: 2012-08-03 18:25:18 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
erreur logique lors enregistrement
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
Modified: branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php 2012-08-03 15:55:56 UTC (rev 4549)
+++ branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php 2012-08-03 18:25:18 UTC (rev 4550)
@@ -46,7 +46,13 @@
public function delete_account ($id){
- tep_db_query("delete from " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " where products_id=" . (int)$id);
+ $extra_fields_query = tep_db_query("select ce.epf_id as id, epf_input_type as type, epf_active_value_language as active_value_language from " . TABLE_PRODUCTS_EXTRA_FIELDS . " ce where ce.epf_status=1 AND epf_special_mod='' ");
+
+ while($extra_fields = tep_db_fetch_array($extra_fields_query)) {
+
+ //! This function returns an array with variables to update into TABLE_ADDRESS_BOOK
+ tep_db_query("delete from " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " eppf where products_id=" . (int)$id." AND products_extra_fields_id='".$extra_fields['id']."' ");
+ }
}
/**
@@ -64,13 +70,13 @@
*/
public function after_update($products_id) {
- //! This function returns an array with variables to update into TABLE_ADDRESS_BOOK
- tep_db_query("delete from " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " where products_id=" . (int)$products_id);
+ $extra_fields_query = tep_db_query("select ce.epf_id as id, epf_input_type as type, epf_active_value_language as active_value_language from " . TABLE_PRODUCTS_EXTRA_FIELDS . " ce where ce.epf_status=1 AND epf_special_mod='' ");
+ while($extra_fields = tep_db_fetch_array($extra_fields_query)) {
- $extra_fields_query = tep_db_query("select ce.epf_id as id, epf_input_type as type, epf_active_value_language as active_value_language from " . TABLE_PRODUCTS_EXTRA_FIELDS . " ce where ce.epf_status=1 AND epf_special_mod='' ");
+ //! This function returns an array with variables to update into TABLE_ADDRESS_BOOK
+ tep_db_query("delete from " . TABLE_PRODUCTS_TO_PRODUCTS_EXTRA_FIELDS . " eppf where products_id=" . (int)$products_id." AND products_extra_fields_id='".$extra_fields['id']."' ");
- while($extra_fields = tep_db_fetch_array($extra_fields_query)) {
$val = array();
$obj = new stdClass();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-03 15:56:03
|
Revision: 4549
http://oscss.svn.sourceforge.net/oscss/?rev=4549&view=rev
Author: oscim
Date: 2012-08-03 15:55:56 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
correction diverse , centralisation des element less sur default
correction
Ajout recherche dans le theme par defaut si non trouv?\195?\169 dans le theme courant lors des appels css , less et js
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php
branches/2.1.1/catalog/admin/includes/functions/html_output.php
branches/2.1.1/catalog/admin/includes/javascript/modules/pages/products.js.php
branches/2.1.1/catalog/admin/includes/template/defaut/login-panel.css
branches/2.1.1/catalog/admin/includes/template/oscss/data/icon_set.xml
branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css
branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_plugins.php
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/defaut/element.less
branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
Modified: branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/classes/oscss_cstr.php 2012-08-03 15:55:56 UTC (rev 4549)
@@ -281,10 +281,12 @@
@return (bool)false OR string path file
*/
public static function test_gab_theme($element,$ext='php'){
+// var_dump(DIR_WS_TEMPLATES.DEFAULT_TEMPLATE_NAME.'/'.$element.'.'.$ext);
if (self::TestFile(DIR_WS_TEMPLATE.$element.'-'.$_SESSION['login_groups_id'].'.'.$ext) ) return DIR_WS_TEMPLATE.$element.'-'.$_SESSION['login_groups_id'].'.'.$ext;
elseif (self::TestFile(DIR_WS_TEMPLATE.$element.'-'.$_SESSION['login_id'].'.'.$ext) ) return DIR_WS_TEMPLATE.$element.'-'.$_SESSION['login_id'].'.'.$ext;
elseif (self::TestFile(DIR_WS_TEMPLATE.$element.'-1.'.$ext) ) return DIR_WS_TEMPLATE.$element.'-1.'.$ext;
elseif (self::TestFile(DIR_WS_TEMPLATE.$element.'.'.$ext) ) return DIR_WS_TEMPLATE.$element.'.'.$ext;
+ elseif (self::TestFile(DIR_WS_INCLUDES.'template/'.DEFAULT_TEMPLATE_NAME.'/'.$element.'.'.$ext) ) return DIR_WS_INCLUDES.'template/'.DEFAULT_TEMPLATE_NAME.'/'.$element.'.'.$ext;
else return false;
}
Modified: branches/2.1.1/catalog/admin/includes/functions/html_output.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/functions/html_output.php 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/functions/html_output.php 2012-08-03 15:55:56 UTC (rev 4549)
@@ -109,6 +109,7 @@
$key=md5($value);
if (!isset($deja_charge[$key]) || $force) {
if (substr($value,($long-3),$long)=='css') print "<link rel=\"stylesheet\" href=\"".$refe['url'].$value."\" type=\"text/css\" media=\"all\" />\n";
+ elseif (substr($value,($long-4),$long)=='less') print "<link rel=\"stylesheet/less\" href=\"".$refe['url'].$value."\" type=\"text/css\" />\n";
elseif (substr($value,($long-2),$long)=='js') print '<script type="text/javascript" src="'.$refe['url'].$value.'"></script>'."\n";
elseif(substr($value,($long-3),$long)=='php'||substr($value,($long-3),$long)=='inc') include ($refe['path'].$value);
}
Modified: branches/2.1.1/catalog/admin/includes/javascript/modules/pages/products.js.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/javascript/modules/pages/products.js.php 2012-08-03 15:55:56 UTC (rev 4549)
@@ -62,6 +62,7 @@
.css("top",(e.pageY - xOffset) + "px")
.css("left",(e.pageX + yOffset) + "px");
});
+
};
// }
Added: branches/2.1.1/catalog/admin/includes/template/defaut/element.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/element.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/element.less 2012-08-03 15:55:56 UTC (rev 4549)
@@ -0,0 +1,136 @@
+/*---------------------------------------------------
+ * LESS Elements 0.6
+ * ---------------------------------------------------
+ * A set of useful LESS mixins by Dmitry Fadeyev
+ * Special thanks for mixin suggestions to:
+ * Kris Van Herzeele,
+ * Benoit Adam,
+ * Portenart Emile-Victor,
+ * Ryan Faerman
+ *
+ * More info at: http://lesselements.com
+ * -----------------------------------------------------*/
+
+.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, @start),
+ color-stop(1, @stop));
+ background: -ms-linear-gradient(bottom,
+ @start,
+ @stop);
+ background: -moz-linear-gradient(center bottom,
+ @start 0%,
+ @stop 100%);
+}
+.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(@start,@start,@start)),
+ color-stop(1, rgb(@stop,@stop,@stop)));
+ background: -ms-linear-gradient(bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@start,@start,@start) 100%);
+ background: -moz-linear-gradient(center bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@stop,@stop,@stop) 100%);
+}
+.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
+ border-top: solid 1px @top-color;
+ border-left: solid 1px @left-color;
+ border-right: solid 1px @right-color;
+ border-bottom: solid 1px @bottom-color;
+}
+.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
+ -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+}
+.rounded(@radius: 2px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
+ -webkit-border-top-right-radius: @topright;
+ -webkit-border-bottom-right-radius: @bottomright;
+ -webkit-border-bottom-left-radius: @bottomleft;
+ -webkit-border-top-left-radius: @topleft;
+ -moz-border-radius-topright: @topright;
+ -moz-border-radius-bottomright: @bottomright;
+ -moz-border-radius-bottomleft: @bottomleft;
+ -moz-border-radius-topleft: @topleft;
+ border-top-right-radius: @topright;
+ border-bottom-right-radius: @bottomright;
+ border-bottom-left-radius: @bottomleft;
+ border-top-left-radius: @topleft;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.opacity(@opacity: 0.5) {
+ -moz-opacity: @opacity;
+ -khtml-opacity: @opacity;
+ -webkit-opacity: @opacity;
+ opacity: @opacity;
+}
+.transition-duration(@duration: 0.2s) {
+ -moz-transition-duration: @duration;
+ -webkit-transition-duration: @duration;
+ transition-duration: @duration;
+}
+.rotation(@deg:5deg){
+ -webkit-transform: rotate(@deg);
+ -moz-transform: rotate(@deg);
+ transform: rotate(@deg);
+}
+.scale(@ratio:1.5){
+ -webkit-transform:scale(@ratio);
+ -moz-transform:scale(@ratio);
+ transform:scale(@ratio);
+}
+.transition(@duration:0.2s, @ease:ease-out) {
+ -webkit-transition: all @duration @ease;
+ -moz-transition: all @duration @ease;
+ transition: all @duration @ease;
+}
+.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
+ -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+}
+.box-shadow(@arguments) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
+ -moz-column-width: @colwidth;
+ -moz-column-count: @colcount;
+ -moz-column-gap: @colgap;
+ -moz-column-rule-color: @columnRuleColor;
+ -moz-column-rule-style: @columnRuleStyle;
+ -moz-column-rule-width: @columnRuleWidth;
+ -webkit-column-width: @colwidth;
+ -webkit-column-count: @colcount;
+ -webkit-column-gap: @colgap;
+ -webkit-column-rule-color: @columnRuleColor;
+ -webkit-column-rule-style: @columnRuleStyle;
+ -webkit-column-rule-width: @columnRuleWidth;
+ column-width: @colwidth;
+ column-count: @colcount;
+ column-gap: @colgap;
+ column-rule-color: @columnRuleColor;
+ column-rule-style: @columnRuleStyle;
+ column-rule-width: @columnRuleWidth;
+}
+.translate(@x:0, @y:0) {
+ -moz-transform: translate(@x, @y);
+ -webkit-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
Modified: branches/2.1.1/catalog/admin/includes/template/defaut/login-panel.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/defaut/login-panel.css 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/template/defaut/login-panel.css 2012-08-03 15:55:56 UTC (rev 4549)
@@ -3,7 +3,16 @@
h2 { font-size: 1em }
h3 { font-size: 0.8em }
-#page{position: relative; width : 500px; margin: 0 auto 0 auto; text-align: left;}
+#page{position: relative; width : 500px; margin: 0 auto 0 auto; text-align: left;
+-moz-box-shadow: 10px 5px 5px 0px #000000;
+-webkit-box-shadow: 10px 5px 5px 0px #000000;
+-o-box-shadow: 10px 5px 5px 0px #000000;
+box-shadow: 10px 5px 5px 0px #000000;
+filter:progid:DXImageTransform.Microsoft.Shadow(color=#000000, Direction=116, Strength=5);
+-webkit-border-radius: 10px;
+-moz-border-radius: 10px;
+border-radius: 10px;
+}
#content,
@@ -30,26 +39,41 @@
-moz-border-radius-bottomright: 10px;
-moz-border-radius-bottomleft: 10px;
border-bottom-right-radius: 10px;
-border-bottom-left-radius: 10px;}
+border-bottom-left-radius: 10px;
+}
+
section#forms section { background:transparent url(../../../images/oscss.jpg) 250px top no-repeat; }
.button{font-family:Arial; font-size:13px;white-space:nowrap;}
-input.button{background:#2D79CD; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:white;font-weight:bold;}
+input.button{background:#2D79CD; border:1px solid #003c74; padding:1px 5px; margin:1px 2px;color:white;font-weight:bold;-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+border-radius: 5px;}
input.button:hover{background:#797979; border:1px solid #003c74; padding:1px 5px; margin:1px 2px ; color:white;}
a.button{background:#e3e5f0; border:1px solid #003c74; padding:2px 5px; margin:1px 2px ;color:black;text-decoration:none;}
a.button:hover{background:#797979; border:1px solid #003c74; padding:2px 5px ; margin:1px 2px ; color:white;text-decoration:none;}
-input{ background : #d4dce1; color : #000; font-family : Verdana,Arial,Helvetica,sans-serif; font-size : 1em; border-width : 1px; width:97%; }
+fieldset{
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+input{ background : #d4dce1; color : #000; font-family : Verdana,Arial,Helvetica,sans-serif; font-size : 1em; border-width : 1px; width:97%;-webkit-border-radius: 5px;
+-moz-border-radius: 5px;
+border-radius: 5px; }
+input:hover{
+ border:1px solid #2D79CD;
+ background:white;
+}
.alert{background: none repeat scroll 0 0 white; border: 1px solid red; color: red; left: 15%; margin: 0 auto; padding: 5px 20px; position: absolute; top: -15%; width: 300px; }
#loginc,
#openid {width:214px; float:left}
#openid{ border: 1px solid gray; display: inline; }
#openid,
-#openid INPUT{ font-family: "Trebuchet MS"; font-size: 12px; }
+#openid input{ font-family: "Trebuchet MS"; font-size: 12px; }
#openid label{ font-weight: bold; color: #FF6200; padding-left: 5px; padding-right: 5px; }
-#openid INPUT.openid_login{ background: url(imgs/3rdparty/openid-login-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; color: #000; padding-left: 18px; width: 220px; margin-right: 10px; }
+#openid input.openid_login{ background: url(imgs/3rdparty/openid-login-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; color: #000; padding-left: 18px; width: 220px; margin-right: 10px; }
#openid A{ color: silver; }
#openid A:hover{ color: #5e5e5e; }
#bouton{clear:both;}
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/data/icon_set.xml
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/data/icon_set.xml 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/data/icon_set.xml 2012-08-03 15:55:56 UTC (rev 4549)
@@ -167,7 +167,7 @@
</row_flag>
<type_color>
<![CDATA[
- <span class="color_type" style="background-color:%1$s;">
+ <span class="color_type" style=" border-left: 15px solid%1$s;">
<span class="Val txt">%2$s</span>
</span>
]]>
Added: branches/2.1.1/catalog/admin/includes/template/oscss/definition.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/definition.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/definition.less 2012-08-03 15:55:56 UTC (rev 4549)
@@ -0,0 +1,169 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* define color generic , used in next define */
+// color
+@color_010 : #78222F;
+@color_011 : #FFFFFF;
+@color_012 : #ACAAAC;
+@color_013 : #303030;
+@color_014 : #D7D7D7;
+
+// gardient red
+@color_020 : #AE0405 ;
+@color_021 : #AE0405 ;
+@color_022 : #FD3841 ;
+
+
+
+
+
+/* Normal Definition */
+@margin: 2%;
+@padding_base : 1%;
+@lineheight: 16px;
+@font_size : 11px;
+
+
+@the-border: 1px;
+@base-color: #111;
+@red: #842210; // Fields required
+
+
+/**
+ * menu user
+ */
+@menu_user_bg : #303030;
+@menu_user_border : #3F3F3F ;
+
+// general title page
+@title_h3_color : @color_010;
+@title_h3_color_shadow : #444444 ;
+
+// Fields required
+@field_required : @red ;
+
+// message
+@color_warning : #FBE3E1 ;
+@color_success : #A1F7C2 ;
+@color_notice : #ECFF9C ;
+
+// General header
+
+// nav
+@nav_border : @color_011;
+@nav_master_link : @color_011;
+@nav_master_link_hover : #000000;
+@nav_master_link_hover_shadow : @color_011;
+
+@submenu_bg : @color_013;
+@submenu_bg_hover : #999;
+@submenu_link : #9C9A9B;
+@submenu_link_hover : @color_011;
+@submenu_link_hover_shadow : #000000;
+
+
+// color menu nav (gradient)
+@color_menu_nav_cl_1 : @color_020 ;
+@color_menu_nav_cl_2 : @color_021 ;
+@color_menu_nav_cl_3 : @color_022 ;
+
+// background menu exts, sub nav
+@color_bg_menuexts : @color_010;
+
+
+// Central content
+ /**
+ * tabs
+ */
+ // color bouton classique (gradient)
+ @color_tabs_cl_1 : @color_020 ;
+ @color_tabs_cl_2 : @color_021 ;
+ @color_tabs_cl_3 : @color_022 ;
+ // tabs color text
+ @color_tab_text_default : #ffffff;
+ @color_tab_text_default_shadow : @color_011;
+ @color_tab_text_selected : @color_020;
+ @color_tab_text_selected_shadow : @color_011;
+ @color_tab_text_hover : #ffffff;
+ @color_tab_text_hover_shadow : #555555;
+
+
+
+
+ /**
+ * Button
+ */
+ // color bouton classique (gradient)
+ @color_bouton_cl_1 : @color_020 ;
+ @color_bouton_cl_2 : @color_021 ;
+ @color_bouton_cl_3 : @color_022 ;
+
+ // color bouton and link submit , confirm , valid (gradient)
+ @color_bouton_submit_cl_1 : #248DBC ;
+ @color_bouton_submit_cl_2 : #248DBC ;
+ @color_bouton_submit_cl_3 : #B0F1F7 ;
+
+ // color bouton and link back, annulate, retrun (gradient)
+ @color_bouton_back_cl_1 : #000000 ;
+ @color_bouton_back_cl_2 : #000000 ;
+ @color_bouton_back_cl_3 : #5C5A5D ;
+
+
+ /**
+ * widget
+ */
+ @color_widget_title : @color_010; // title
+ @color_widget_bg_th : @color_010; // th
+
+// block div edit / input gradient background
+@color_bg_gradient_base : #E4E4E4; // base color
+@color_bg_gradient_eob : 200; // deb gradient
+@color_bg_gradient_eon : 255; // end gradient
+
+
+// Table Datatable
+@color_datatable_tr_th : @color_010 ;
+@color_datatable_tr_th_txt : @color_011 ;
+@datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+@bg_hover : #E6FF99; // hover row or filter
+@bg_hover_txt : #000000; // hover row or filter
+
+@bg_table_tr_odd : #F0F0F0;
+@bg_table_tr_even : @color_014;
+@color_sorting : #84509A; // cols sorting
+@color_sorting_text : #A7A7A7;
+
+
+// FORM
+@bg_input : @color_011;
+@bg_input_border : @color_012;
+@bg_input_hover : #F0F0F0;
+@bg_input_border_hover : @color_010;
+
+
+
+/**
+ * Split page / Pagination
+ */
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
+
+
+
+// POPUP
+@color_title_txt : @color_011;
+
+// Load generic element and style
+@import "../defaut/element.less";
+
+@import "../defaut/styles.less";
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php 2012-08-03 15:55:56 UTC (rev 4549)
@@ -20,18 +20,20 @@
<title><?php echo $page_admin.' | '.TITLE; ?></title>
<base href="<?php echo tep_get_http().DIR_WS_ADMIN ?>" />
-<link rel="stylesheet/less" type="text/css" href="<?php echo DIR_WS_TEMPLATE ?>styles.less">
<?php
+ /** les structure */
+ if (($stylesheet=tep_test_gab_ele('definition','less')) !=false) tep_include_file ($stylesheet,true);
+
+ tep_include_file (DIR_WS_INCLUDES."javascript/less-1.3.0.min.js",true);
+
/** Appel des css */
if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
- if (($stylesheet=tep_test_gab_ele('uniform.default','css')) !=false) tep_include_file ($stylesheet,true);
/** Fichier header systheme */
require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'header.php');
/** Appel des js */
tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-1.js",true);
@include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc");
- tep_include_file (DIR_WS_INCLUDES."javascript/less-1.3.0.min.js",true);
?>
</head>
<body class="<?php echo $page_admin; ?>">
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-08-03 15:55:56 UTC (rev 4549)
@@ -9,24 +9,14 @@
*/
-
/* Structure */
div.menuSeparator { padding:2px 10px; display:block; background:#888; border-bottom:1px solid #ccc; font-size:12px; color:#FFF; line-height:14px; clear:both; }
-#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
-#ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
#menu_theme * {display:block;}
-
-
-
+#ssmenu a { float:left; padding:5px 10px; margin:0;font-size:10px;background:#797979;color:white;text-shadow: 0 1px 0 #000;border-right:1px solid #444;}
+#ssmenu a:hover { float:left; padding:5px 10px ; margin:0;font-size:10px;background:#eee;color:#000;text-shadow: 0 1px 0 #fff;-moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);-webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);}
#menubar li.account {padding-right:8px;}
-/* Bookmark */
-#menubookmark p.themeSwitcher select option,
-#menurecently p.themeSwitcher select#recently_viewed option {display:block;}
-
-
-
/* Block formulaire central block right */
#central .box_right form .block_input { -moz-border-radius:6px; -webkit-border-radius:6px; width:97%; margin:2px 1px; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;}
#central .box_right form label {width:20%;text-align:left;font-weight:bold}
@@ -44,20 +34,22 @@
.attributes-even { background-color: #ffffff; }
-/* PAge sPECIFIQUE*/
-/* widjet homePage */
-#homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
-#homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
-#homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
-#homestats dl {padding: 5px 0 10px 5px;}
-#homeNews { background:transparent url(img/1/header_feed.png) bottom right no-repeat; }
-#homeNews dl {padding: 5px 0 10px 5px;}
-#homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
-#homeNews dt span.date {font-size:9px; color:gray;}
-#homeNews dd {padding: 3px; margin-bottom: 5px;}
-#homeNews dt a {text-decoration:none; color:#545683;}
-#homeNews dt a:hover {color:#9D9FBF;}
+/* page specifique*/
+ /* widjet homePage */
+ #homestats { background:transparent url(../../../images/stats.gif) bottom right no-repeat; }
+ #homestats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
+ #homestats dt {float:left; width: 13em; padding: 3px; line-height: 1.5em; text-align:right; font-weight:bold;}
+ #homestats dl {padding: 5px 0 10px 5px;}
+
+ #homeNews { background:transparent url(img/1/header_feed.png) bottom right no-repeat; }
+ #homeNews dl {padding: 5px 0 10px 5px;}
+ #homeNews dt {padding: 3px; font-size:12px; font-weight:bold;}
+ #homeNews dt span.date {font-size:9px; color:gray;}
+ #homeNews dd {padding: 3px; margin-bottom: 5px;}
+ #homeNews dt a {text-decoration:none; color:#545683;}
+ #homeNews dt a:hover {color:#9D9FBF;}
+
/* statistqiue et rapport*/
table.dataTable.stat.stock tr {margin:2px; position:relative }
#central.stats tr.OutofStock{background:#d95017;}
@@ -74,15 +66,10 @@
#salesStats .BarGraph li.p0{margin:0 0 -3px 16px;color:#FFF;}
-/* Adress */
-.ViewAddress {padding:5px; }
-
/* Widget BOX */
-.graph{width:95%;}
-
.box ul,
.box p,
.box dl { list-style-type:none; margin:0 0 0 2px; padding:0 10px 10px 10px ;}
Modified: branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_plugins.php
===================================================================
--- branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_plugins.php 2012-08-02 23:21:02 UTC (rev 4548)
+++ branches/2.1.1/catalog/includes/classes/core_page/overlay/oscss_plugins.php 2012-08-03 15:55:56 UTC (rev 4549)
@@ -105,7 +105,6 @@
$active = true;
$fpath = $path;
}
-
if($active){
$array_file[]=$fpath;
if(!self::testCache($fpath) && !function_exists($r['value'].'_scripts')){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-02 23:21:10
|
Revision: 4548
http://oscss.svn.sourceforge.net/oscss/?rev=4548&view=rev
Author: oscim
Date: 2012-08-02 23:21:02 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Suite travail de nettoyage et d'amelioration de la centraliation du css sur le theme oscss du BO
Ajutement et nettoyage html
correction coquille dans le detail des clients/membres
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/application_bottom.php
branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php
branches/2.1.1/catalog/admin/includes/functions/html_output.php
branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/pages/stock.php
branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php
branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
Modified: branches/2.1.1/catalog/admin/includes/application_bottom.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/application_bottom.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -75,8 +75,38 @@
//! Fancy exe
$('a.fancytext').fancybox({'overlayOpacity':0.6});
- $('a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').fancybox({'overlayOpacity':0.6, autoDimensions:true, showCloseButton:false, changeSpeed:0, titleShow:false});
+ $('a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').fancybox({
+ 'overlayOpacity':0.5,
+ autoDimensions:true,
+ showCloseButton:false,
+ changeSpeed:0,
+ titleShow:false,
+ 'hideOnOverlayClick': false
+ });
+// $('a.fancytext,a.buttonimg.fancy,a.button.fancy,a.buttonimg.fancyView,a.button.fancyView').bind('click', function() {
+// var $this = $(this);
+// var outputHolder = $("<div id='.uimodal-output'></div>");
+//
+//
+// $("body").append(outputHolder);
+// outputHolder.load($this.attr("href"), null, function() {
+// // whatever params you want
+// outputHolder.dialog({
+// open: function() {
+// $("#btjsclose").click(function(){
+// outputHolder.dialog('close');
+// return false;
+// });
+// }
+// });
+// });
+//
+// return false;
+// });
+
+
+
//! Updat GET
$('a.buttonimg.fancy,a.button.fancy,form.fancy').each(function(){
var reg = /(forceajax)/gi;
@@ -89,6 +119,10 @@
this.href +='&forceview=true';
});
+
+
+
+
// Tabs Exe
var $tabs = $('#tabs, .tabs').tabs({cookie: {expires:30}}).find('.ui-tabs-nav').sortable({axis:'x'});
Modified: branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/boxes/00_hidden.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -26,6 +26,7 @@
$tabl_link[]= array('upload.php', '', '');
$tabl_link[]= array('upload_process.php', '', '');
$tabl_link[]= array('upload_file.php', '', '');
+ $tabl_link[]= array('stats_customers_orders.php', '', '');
/**
NOTE: Ne placer dans ce fichier que les liens qui ne doivent pas apparaitre dans le menu, mais qui doivent être idexe dans l agestion des acls.
Modified: branches/2.1.1/catalog/admin/includes/functions/html_output.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/functions/html_output.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/functions/html_output.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -225,7 +225,7 @@
*/
function tep_js_back($href,$text=IMAGE_BACK){
$js = (isset($_GET['fancy']) || isset($_GET['forceview'])) ? ' onclick="parent.$.fancybox.close();" ': (isset($_GET['forceajax']) ? ' onclick="$.fancybox.close();return false;" ' : '') ;
- return '<a class="button ActionBack" href="' . $href . '" '.$js.'>'.$text.'</a>';
+ return '<a id="btjsclose" class="button ActionBack" href="' . $href . '" '.$js.'>'.$text.'</a>';
}
// public images
Modified: branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.edit.gab 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/gabarit/customers/display_view.edit.gab 2012-08-02 23:21:02 UTC (rev 4548)
@@ -17,7 +17,7 @@
<div class="box_uniq block_form">
-<div class="box_left">
+
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('tab customers data'); ?></a></li>
@@ -32,6 +32,7 @@
</ul>
+<div class="box_left edit">
<div id="tabs-1" class="tabPage">
@@ -118,12 +119,12 @@
$g++;
}
} ?>
-
- </div>
<div class="separator"></div>
</div>
+ </div>
- <div class="box_right">
+
+ <div class="box_right edit">
<p class="block_input input-multi">
<label for="customers_group_ra"><?php echo __('entry customers group request authentication'); ?></label>
<?php if (customers::$processed == true) echo (customers::$Info->customers_group_ra)?__('entry customers group ra yes') : __('entry customers group ra no') ;
@@ -149,13 +150,17 @@
<?php endif; ?>
<div class="button_nav">
- <?php if (customers::$processed != true) echo tep_image_submit('button_update.gif', IMAGE_UPDATE). tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' ); ;
+ <?php if (customers::$processed != true)
+ echo tep_image_submit('button_update.gif', IMAGE_UPDATE). tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
+ else
+ echo '<a class="button" href="'. tep_href_link(customers::FILENAME,'action=edit&cID='.customers::$Id.'&origin='.urlencode(tep_href_link(customers::FILENAME,'action=noedit&cID='.customers::$Id)) ).
+ '" />'.__('@customers text bouton edit').'</a>';
- if(isset($_GET['origin'])) echo tep_js_back(tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])), IMAGE_BACK) ;
- else echo tep_js_back(tep_href_link(customers::FILENAME, tep_get_all_get_params(array('action'))), IMAGE_CANCEL);
+ if(isset($_GET['origin'])) echo tep_js_back(tep_href_link(basename($_GET['origin']), strchr('?',$_GET['origin'])), IMAGE_BACK) ;
+ else echo tep_js_back(tep_href_link(customers::FILENAME, tep_get_all_get_params(array('action'))), IMAGE_CANCEL);
?>
- <?php echo tep_draw_hidden_field('default_address_id', 'default_address_id', customers::$Info->customers_default_address_id);
- if(customers::$action !='new') echo tep_draw_hidden_field('customers_id', 'customers_id', customers::$Info->customers_id); ?>
+ <?php echo tep_draw_hidden_field('default_address_id', 'default_address_id', customers::$Info->customers_default_address_id);
+ if(customers::$action !='new') echo tep_draw_hidden_field('customers_id', 'customers_id', customers::$Info->customers_id); ?>
</div>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/gabarit/mail.page.gab 2012-08-02 23:21:02 UTC (rev 4548)
@@ -16,6 +16,7 @@
<!-- PREVIEW -->
<?php if (mail::$action == 'preview') : ?>
<div class="box_uniq">
+<div class="edit">
<?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=send_email_to_user'); ?>
<p><?php echo mail::repost() ?></p>
<table class="dataTableBase">
@@ -34,52 +35,66 @@
</table>
<?php echo tep_image_submit('button_send_mail.gif', __('image send email')); ?>
</form>
+</div>
</div>
<?php else: ?>
<!-- FORM -->
+
<?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=preview'); ?>
+
<div class="box_left">
- <fieldset class="block_field">
- <p class="block_input">
- <label for="customers_email_address" class="main"><?php echo __('text customer'); ?></label>
- <?php echo mail::get_list_customers() ?>
- </p>
+ <div class="edit">
+ <fieldset class="block_field">
+ <p class="block_input">
+ <label for="customers_email_address" class="main"><?php echo __('text customer'); ?></label>
+ <?php echo mail::get_list_customers() ?>
+ </p>
- <p class="block_input">
- <label for="from"><?php echo __('text from'); ?></label>
- <?php echo tep_draw_input_field('from','', mail::$list->from); ?>
- </p>
+ <p class="block_input">
+ <label for="from"><?php echo __('text from'); ?></label>
+ <?php echo tep_draw_input_field('from','', mail::$list->from); ?>
+ </p>
- <p class="block_input">
- <label for="subject"><?php echo __('text subject'); ?></label>
- <?php echo tep_draw_input_field('subject','',mail::$list->subject); ?>
- </p>
+ <p class="block_input">
+ <label for="subject"><?php echo __('text subject'); ?></label>
+ <?php echo tep_draw_input_field('subject','',mail::$list->subject); ?>
+ </p>
- <p class="block_input">
- <label for="p_format"><?php echo __('text format'); ?></label>
- <?php echo tep_draw_pull_down_menu('p_format', array(array('id'=>'HTML', 'text'=>'html'),array('id'=>'TEXT', 'text'=>'text')), (isset($_POST['customer']) ? $_POST['customer'] : ''));?>
- </p>
+ <p class="block_input">
+ <label for="p_format"><?php echo __('text format'); ?></label>
+ <?php echo tep_draw_pull_down_menu('p_format', array(array('id'=>'HTML', 'text'=>'html'),array('id'=>'TEXT', 'text'=>'text')), (isset($_POST['customer']) ? $_POST['customer'] : ''));?>
+ </p>
- <br style="clear:both" />
- <p class="block_uniq tcenter">
- <label for="message"><?php echo __('text message'); ?></label>
- <br style="clear:both" />
- <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','message_form','800','400',mail::$list->content); ?>
- </p>
+ <br style="clear:both" />
+ <p class="block_uniq tcenter">
+ <label for="message"><?php echo __('text message'); ?></label>
+ <br style="clear:both" />
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','message_form','800','400',mail::$list->content); ?>
+ </p>
- </fieldset>
+ </fieldset>
-
+ <br class="clear" />
+ </div>
</div>
+
<div class="box_right">
- <?php echo __('txt usage code in mail') ?>
-
- <div class="button_nav">
- <?php if (mail::$action == 'preview')echo '<a class="button" href="' . tep_href_link(FILENAME_MAIL) . '">' . IMAGE_CANCEL . '</a> '; ?>
- <?php echo tep_image_submit('button_send_mail.gif', __('image preview')); ?>
+ <div class="edit">
+
+ <fieldset class="block_field">
+ <p><?php echo __('txt usage code in mail') ?></p>
+ <div class="button_nav">
+ <?php if (mail::$action == 'preview')echo '<a class="button" href="' . tep_href_link(FILENAME_MAIL) . '">' . IMAGE_CANCEL . '</a> '; ?>
+ <?php echo tep_image_submit('button_send_mail.gif', __('image preview')); ?>
+ </div>
+ </fieldset>
+ <br class="clear" />
</div>
</div>
+
+
</form>
+
<?php endif; ?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/gabarit/orders/display_view.edit.gab 2012-08-02 23:21:02 UTC (rev 4548)
@@ -10,7 +10,7 @@
*/
global $price, $current_theme;
?>
-<div class="box_uniq block_form main-orders">
+<div class="box_uniq main-orders">
<div id="tabs">
<ul>
@@ -29,25 +29,25 @@
<!-- DRAW DETAIL CUSTOMERS -->
- <div class="box_uniq">
+ <div class="box_uniq block_form">
<fieldset class="block_field fleft w_50" >
- <legend><?php echo __('entry customer'); ?></legend>
- <p class="block_input">
- <?php echo tep_address_format(orders::$order->customer['format_id'], orders::$order->customer, 1, '', '<br />'); ?><br />
- </p>
+ <legend class="Ctrtirroir"><?php echo __('entry customer'); ?></legend>
+ <p class="block_input tirroir">
+ <?php echo tep_address_format(orders::$order->customer['format_id'], orders::$order->customer, 1, '', '<br />'); ?><br />
+ </p>
</fieldset>
<fieldset class="block_field fleft w_50" >
- <legend><?php echo __('legend contact customers'); ?></legend>
- <p class="block_input">
- <strong><?php echo __('entry telephone number'); ?></strong><?php echo orders::$order->customer['telephone']; ?>
- <br />
+ <legend class="Ctrtirroir"><?php echo __('legend contact customers'); ?></legend>
+ <p class="block_input tirroir">
+ <strong><?php echo __('entry telephone number'); ?></strong><?php echo orders::$order->customer['telephone']; ?>
+ <br />
- <strong><?php echo __('entry email address'); ?></strong><?php echo '<a href="mailto:' . orders::$order->customer['email_address'] . '">' . orders::$order->customer['email_address'] . '</a>'; ?>
- <br />
+ <strong><?php echo __('entry email address'); ?></strong><?php echo '<a href="mailto:' . orders::$order->customer['email_address'] . '">' . orders::$order->customer['email_address'] . '</a>'; ?>
+ <br />
- <strong><?php echo __('entry ip'); ?></strong><?php echo orders::$order->info['ip_address']; ?>
- </p>
+ <strong><?php echo __('entry ip'); ?></strong><?php echo orders::$order->info['ip_address']; ?>
+ </p>
</fieldset>
</div>
@@ -55,7 +55,7 @@
<!-- DRAW ADRESS SHIPING / BILLING -->
<?php /** Billing Address */ ?>
- <div class="box_uniq">
+ <div class="box_uniq block_form">
<fieldset class="block_field fleft w_50" >
@@ -108,7 +108,7 @@
</fieldset>
<?php /** Shipping address */ ?>
- <fieldset class="block_field fleft w_50" >
+ <fieldset class="block_field fleft w_50 " >
<legend>
<?php echo __('entry shipping address'); ?>
@@ -174,8 +174,8 @@
<?php /** Payment Methode */ ?>
- <div class="box_uniq">
- <fieldset class="block_field fleft w_50">
+ <div class="box_uniq block_form">
+ <fieldset class="block_field fleft w_50 ">
<legend><?php echo __('entry payment method'); ?>
<?php if( !in_array(orders::$order->info['orders_status_id'], array(DEFAULT_ORDERS_STATUS_COMPLETED, DEFAULT_ORDERS_STATUS_ANNULATE ) ) ): ?>
<span class="row_action">
@@ -214,7 +214,7 @@
<?php /** Shipping Methode */ ?>
<?php if(isset(orders::$order->delivery['street_address'])): ?>
- <fieldset class="block_field fleft w_50">
+ <fieldset class="block_field fleft w_50 ">
<legend><?php echo __('entry shipping method'); ?>
<?php if( !in_array(orders::$order->info['orders_status_id'], array(DEFAULT_ORDERS_STATUS_COMPLETED, DEFAULT_ORDERS_STATUS_ANNULATE ) ) ): ?>
<span class="row_action">
@@ -246,7 +246,8 @@
</div>
- <div class="box_uniq">
+ <div class="box_uniq block_form">
+
<table class="main-orders history padd_w">
<thead>
<tr>
@@ -310,7 +311,7 @@
<div id="tabs-2" class="tabPage">
<?php echo tep_draw_form('status_form', orders::FILENAME,'oID='.orders::$oID.'&action=update_order', 'post', ' class="block_form"'); ?>
-
+ <div class="edit">
<table class="dataTableBase orders">
<thead>
<tr>
@@ -396,6 +397,8 @@
</div>
<?php endif; ?>
</fieldset>
+ <br class="clear" />
+ </div>
</form>
</div>
@@ -408,7 +411,7 @@
*/
?>
<div id="tabs-3" class="tabPage">
-
+ <div class="edit">
<table class="main-orders history">
<thead>
<tr>
@@ -432,7 +435,8 @@
<?php endforeach; ?>
</tbody>
</table>
-
+ <br class="clear" />
+ </div>
</div>
@@ -486,7 +490,7 @@
<br />
- <div>
+ <div class="edit">
<h4><?php echo __('heading form expedition'); ?></h4>
<!-- DEB Form add expedition -->
<?php echo tep_draw_form('add_deliv', orders::FILENAME,'oID='.orders::$oID.'&action=shipping&method=add', 'post', ' class="block_form"'); ?>
@@ -553,6 +557,7 @@
<?php echo tep_image_submit('button_update.gif', IMAGE_UPDATE); ?>
</div>
<?php endif; ?>
+ <br class="clear" />
</div>
<!-- END Form add expedition -->
@@ -630,6 +635,20 @@
<div class="main-orders block fleft w_50 padd_w">
+
+ <div class="block_field fleft w_50" >
+ <h4><?php echo __('legend contact customers'); ?></h4>
+ <p class="block_input">
+ <strong><?php echo __('entry telephone number'); ?></strong><?php echo orders::$order->customer['telephone']; ?>
+ <br />
+
+ <strong><?php echo __('entry email address'); ?></strong><?php echo '<a href="mailto:' . orders::$order->customer['email_address'] . '">' . orders::$order->customer['email_address'] . '</a>'; ?>
+ <br />
+
+ <strong><?php echo __('entry ip'); ?></strong><?php echo orders::$order->info['ip_address']; ?>
+ </p>
+ </div>
+
</div>
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-08-02 23:21:02 UTC (rev 4548)
@@ -60,10 +60,13 @@
-/* Edit */
+/* Edit / No edit */
/* Heading */
$lang['heading title']="Clients" ;
+ /* button */
+ $lang['@customers text bouton edit']="Modifier" ;
+
/* forms */
$lang['text date account created']="Compte créé : " ;
$lang['text date account last modified']="Dernière modification : " ;
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/customers.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/customers.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -653,7 +653,7 @@
$action=self::$action;
switch ($action) {
-
+ case 'detail':
case 'delete':
case 'view':
case 'noedit':
@@ -811,10 +811,11 @@
/** static InterfacedInnerHtml */
public static function detail_row_page($id){
+ // force rattribution id
+ $_REQUEST['cID'] = (int)$id;
self::GetConf();
self::load_db_values((int)$id);
-
$res=tep_db_query($customers_query_raw = "select sum(op.products_quantity * op.final_price) as ordersum from " . TABLE_CUSTOMERS . " c, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS . " o where c.customers_id = o.customers_id and c.customers_id='".(int)$id."' and o.orders_id = op.orders_id group by c.customers_firstname, c.customers_lastname order by ordersum DESC");
$r=tep_db_fetch_array($res);
self::$Info->orders_sum=$r['ordersum'];
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -573,7 +573,7 @@
'type'=>'getLink',
'format'=>'button_nav',
'image'=>'',
- 'cssclass'=>'button',
+ 'cssclass'=>'',
'title'=>__('@products image create new product'),
'url'=>tep_href_link(self::FILENAME, 'action=new'),
);
@@ -583,7 +583,7 @@
'type'=>'getLink',
'format'=>'button_nav',
'image'=>'',
- 'cssclass'=>'button fancy',
+ 'cssclass'=>'fancy',
'title'=> __('@products add category datatype product'),
'url'=>tep_href_link(FILENAME_CATEGORIES, '&datatype='.self::$datatype.'&action=new_light&origin='. self::FILENAME),
);
@@ -594,7 +594,7 @@
'type'=>'getLink',
'format'=>'button_nav',
'image'=>'',
- 'cssclass'=>'button linkrss',
+ 'cssclass'=>'linkrss',
'title'=>tep_image(DIR_WS_ICONS.'icon_feed.png' , IMAGE_TRACKED_LOW_STOCK,16,16) .__('@products link rss low stock'),
'url'=>tep_href_link(FILENAME_FEEDS,'box=low_stock'),
);
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/stock.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/stock.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/stock.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -402,11 +402,12 @@
}*/
//Talk about summary and calc stock
- if($facts_array['summary_and_calc_stock_match']){
- $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The stock quantity summary is ok</span><br />
- This means that the current summary of this products quantity, which is in the database, is the value we get if we calculates it from scratch right now.<br />
- <b>The Summary stock is: '. $facts_array['summary_stock'] .'</b><br /><br />';
- }else{
+// if($facts_array['summary_and_calc_stock_match']){
+// $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The stock quantity summary is ok</span><br />
+// This means that the current summary of this products quantity, which is in the database, is the value we get if we calculates it from scratch right now.<br />
+// <b>The Summary stock is: '. $facts_array['summary_stock'] .'</b><br /><br />';
+// }else{
+ if(! $facts_array['summary_and_calc_stock_match']){
$str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">The stock quantity summary is NOT ok</span><br />
This means that the current summary of this products quantity, which is in the database, isn\'t the value we get if we calculates it from scratch right now.<br />
<b>The current summary stock is: '. $facts_array['summary_stock'] .'</b><br />
@@ -414,13 +415,14 @@
}
//Talk about the health of the stock entries
- if($facts_array['stock_entries_healthy']){
- $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The options stock is ok</span><br />
- This means that the database entries for this product looks the way they should. No options are missing in any row. No option exist in any row where it should not.<br />
- <b>Total number of stock entries this product has: '. $facts_array['stock_entries_count'] .'</b><br />
- <b>Number of messy entries: '. $facts_array['sick_stock_entries_count'] .'</b><br />';
-
- }else{
+// if($facts_array['stock_entries_healthy']){
+// $str_ret .='<span style="color:green; font-weight: bold; font-size:1.2em;">The options stock is ok</span><br />
+// This means that the database entries for this product looks the way they should. No options are missing in any row. No option exist in any row where it should not.<br />
+// <b>Total number of stock entries this product has: '. $facts_array['stock_entries_count'] .'</b><br />
+// <b>Number of messy entries: '. $facts_array['sick_stock_entries_count'] .'</b><br />';
+//
+// }else{
+ if(!$facts_array['stock_entries_healthy']){
$str_ret .='<span style="color:red; font-weight: bold; font-size:1.2em;">'.__('the options stock is not ok').'</span><br />'.
__('this means that at least one of the database entries for this product is messed up. either options are missing in rows or options exist in rows they should not.').'<br />'.
'<b>'.__('total number of stock entries this product has: '). $facts_array['stock_entries_count'] .'</b><br />'.
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/gabarit-1.php 2012-08-02 23:21:02 UTC (rev 4548)
@@ -30,16 +30,9 @@
/** Appel des js */
tep_include_file (DIR_WS_TEMPLATE."inc/lib_general-1.js",true);
@include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc");
- tep_include_file (DIR_WS_TEMPLATE."js/jquery.uniform.min.js",true);
tep_include_file (DIR_WS_INCLUDES."javascript/less-1.3.0.min.js",true);
?>
-
-<script type="text/javascript" charset="utf-8">
- $(function(){
- $("input[type=text],input[type=checkbox], textarea").uniform();
- });
-</script>
</head>
<body class="<?php echo $page_admin; ?>">
<div id="glob">
Modified: branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/styles.less 2012-08-02 15:52:36 UTC (rev 4547)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/styles.less 2012-08-02 23:21:02 UTC (rev 4548)
@@ -8,35 +8,62 @@
* @encode UTF-8
*/
-/* Definition */
+/* define color generic , used in next define */
+ // color
+ @color_010 : #78222F;
+ @color_011 : #FFFFFF;
+ @color_012 : #ACAAAC;
+
+ // gardient red
+ @color_020 : #AE0405 ;
+ @color_021 : #AE0405 ;
+ @color_022 : #FD3841 ;
+
+
+
+
+/* Normal Definition */
@margin: 2%;
@lineheight: 16px;
+ @font_size : 11px;
@the-border: 1px;
@base-color: #111;
@red: #842210;
+
+ // general title page
+ @title_h3_color : @color_010;
+ @title_h3_color_shadow : #444444 ;
+
+// General header
+
+ // color menu nav (gradient)
+ @color_menu_nav_cl_1 : @color_020 ;
+ @color_menu_nav_cl_2 : @color_021 ;
+ @color_menu_nav_cl_3 : @color_022 ;
+
+ // background menu exts, sub nav
+ @color_bg_menuexts : @color_010;
+
+
+// Central content
+
// tabs color text
@color_tab_text_default : #ffffff;
- @color_tab_text_selected : #AE0405;
+ @color_tab_text_selected : @color_020;
@color_tab_text_hover : #555555;
- // color menu nav (gradient)
- @color_menu_nav_cl_1 : #AE0405 ;
- @color_menu_nav_cl_2 : #AE0405 ;
- @color_menu_nav_cl_3 : #FD3841 ;
-
-
// color bouton classique (gradient)
- @color_tabs_cl_1 : @color_menu_nav_cl_1 ;
- @color_tabs_cl_2 : @color_menu_nav_cl_2 ;
- @color_tabs_cl_3 : @color_menu_nav_cl_3 ;
+ @color_tabs_cl_1 : @color_020 ;
+ @color_tabs_cl_2 : @color_021 ;
+ @color_tabs_cl_3 : @color_022 ;
// color bouton classique (gradient)
- @color_bouton_cl_1 : @color_menu_nav_cl_1 ;
- @color_bouton_cl_2 : @color_menu_nav_cl_2 ;
- @color_bouton_cl_3 : @color_menu_nav_cl_3 ;
+ @color_bouton_cl_1 : @color_020 ;
+ @color_bouton_cl_2 : @color_021 ;
+ @color_bouton_cl_3 : @color_022 ;
// color bouton and link submit , confirm , valid (gradient)
@color_bouton_submit_cl_1 : #248DBC ;
@@ -49,23 +76,39 @@
@color_bouton_back_cl_3 : #5C5A5D ;
// widget
- @color_widget_1 : #78222F; // title and th
+ @color_widget_1 : @color_010; // title and th
+ // block div edit / input gradient background
+ @color_bg_gradient_base : #E4E4E4; // base color
+ @color_bg_gradient_eob : 200; // deb gradient
+ @color_bg_gradient_eon : 255; // end gradient
+
+
+ // Table Datatable
+ @color_datatable_tr_th : @color_010 ;
+ @color_datatable_tr_th_txt : @color_011 ;
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
+
@bg_hover : #E6FF99; // hover row or filter
@bg_hover_txt : #000000; // hover row or filter
-
-
+
@bg_table_tr_odd : #F0F0F0;
@bg_table_tr_even : #D7D7D7;
@color_sorting : #84509A; // cols sorting
@color_sorting_text : #A7A7A7;
- @datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+ // FORM
+ @bg_input : @color_011;
+ @bg_input_border : @color_012;
+ @bg_input_hover : #F0F0F0;
+ @bg_input_border_hover : @color_010;
- @color_split : #78222F;
- @color_split_active : #78222F;
- @color_split_active_text : white;
+ // Split page / Pagination
+ @color_split : @color_010;
+ @color_split_active : @color_010;
+ @color_split_active_text : #FFFFFF;
/* Mixin */
@@ -121,11 +164,11 @@
h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
h3 {
clear:both;
- color: #78222F;
+ color: @title_h3_color;
font-size: 20px;
font-weight: bold;
padding: 5px 0 5px 10px;
- text-shadow: 0 1px 1px #444444;
+ text-shadow: 0 1px 1px @title_h3_color_shadow ;
}
h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
@@ -133,6 +176,23 @@
ul {list-style:none;}
th { margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
+ input,
+ select,
+ textarea,
+ button {
+ padding:2px 5px;
+ font-family: Verdana,Arial,sans-serif;
+ font-size: (@font_size*1.3);
+ border:1px solid @bg_input_border;
+ background: @bg_input ;
+ .border-radius(5px);
+ .rounded(5px);
+
+ &:hover{
+ border:1px solid @bg_input_border_hover;
+ background: @bg_input_hover ;
+ }
+ }
/* general class */
@@ -168,7 +228,7 @@
/* --- message box --- */
- .messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
+ .messageBox { font-family: Verdana, Arial, sans-serif; font-size: @font_size; padding:0;}
.messageStack{ font-family: Verdana, Arial, sans-serif;}
.messageStack li{padding:2px 0;}
.messageStackError,
@@ -178,7 +238,7 @@
/* toogle item complet js action */
h4.Ctrtirroir,
- h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: 14px; }
+ h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: (@font_size*1.1); }
.Ctrtirroir {
background:transparent url('../../../images/icons/icon_down.gif') left top no-repeat;
padding-left:20px;
@@ -204,7 +264,7 @@
// color:#000;
margin:0;
padding:0;
- font: normal 11px Verdana, Arial, sans-serif;
+ font: normal @font_size Verdana, Arial, sans-serif;
}
@@ -225,19 +285,19 @@
a {
display:block;
- color:white;
+ color:#FFFFFF;
text-decoration:none;
height:(@lineheight * 1.1);
text-align:center;
- font:normal 11px Verdana, Arial, sans-serif;
+ font:normal @font_size Verdana, Arial, sans-serif;
&:link,
&:visited {
- color:white;
+ color:#FFFFFF;
}
&:hover {
- color:#000;
+ color:#000000;
text-decoration:none;
}
}
@@ -343,7 +403,7 @@
margin:0;
padding:0 1em 0 0;
text-align:right;
- color:white;
+ color:#FFFFFF;
select {
margin:2px;
@@ -357,7 +417,7 @@
.bw-gradient( #E4E4E4, 200, 255) ;
- option{ color:white;font-size:0.9em; }
+ option{ color:#FFFFFF;font-size:(@font_size *0.9); }
}
}
@@ -376,7 +436,7 @@
li{
position:relative;
float:left;
- background: none repeat-x scroll 0 0 #78222F;
+ background: none repeat-x scroll 0 0 @color_bg_menuexts;
height: 25px;
padding: 0 8px;
@@ -387,8 +447,8 @@
text-shadow:none;
height:18px;
text-align:center;
- font:normal 11px Verdana, Arial, sans-serif;
- color:white;
+// font:normal @font_size Verdana, Arial, sans-serif;
+ color:#FFFFFF;
&:hover{
color:gray;
@@ -449,13 +509,13 @@
margin:0;
padding:0;
width:100%;
- color:white;
+ color:#FFFFFF;
h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
- h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
+ h2 {display:inline; line-height:25px; color:#FFFFFF; vertical-align:top;}
a,
- span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+ span{padding-right:1em; color:#FFFFFF; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
a:hover{text-decoration:underline;}
}
@@ -469,7 +529,7 @@
border-left: 1px solid black;
border-right: 1px solid black;
border-bottom: 1px solid black;
- background:white;
+ background:#FFFFFF;
div.box_uniq {
width:100%;
@@ -505,14 +565,14 @@
clear:both;
height:25px;
background:#303030;
- color:white;
+ color:#FFFFFF;
a,
a:link,
a:visited {
text-shadow : none;
padding: 4px 25px;
- color:white;
+ color:#FFFFFF;
}
// logo link partenaires
@@ -524,12 +584,12 @@
background: #505050;
clear:both;width:100%;
text-align:center;
- color:white;
+ color:#FFFFFF;
a,
a:link,
a:visited {
- color:white;
+ color:#FFFFFF;
text-decoration: none;
&:hover{
@@ -554,7 +614,7 @@
font-family:Arial;
white-space:nowrap;
float:right;
- color:white;
+ color:#FFFFFF;
vertical-align:middle;
border:1px solid #fff;
height: 25px;
@@ -573,11 +633,11 @@
}
input.button,
- button.button{font-size:11px; background:#ccc;padding:2px 5px; }
+ button.button{font-size:@font_size; background:#ccc;padding:2px 5px; }
a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{color:white;text-decoration:none; }
+ a.button:hover{color:#FFFFFF;text-decoration:none; }
a.button,
select.button,
@@ -597,13 +657,13 @@
a.button.ActionBack,
input[type=image].button.ActionBack,
button.button.ActionBack {
- color:white;
+ color:#FFFFFF;
.gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
}
input:hover.button,
- button:hover.button{background:#797979;color:white;}
+ button:hover.button{background:#797979;color:#FFFFFF;}
a:hover.button,
input:hover.button,
@@ -622,7 +682,7 @@
a.button.ActionBack,
input.button.ActionBack,
button.button.ActionBack {
- color:white;
+ color:#FFFFFF;
.gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
}
@@ -715,8 +775,8 @@
background: none repeat scroll 0 0 #797979;
border-right: 1px solid #444444;
clear: both;
- color: white;
- font-size: 10px;
+ color: #FFFFFF;
+ font-size: @font_size;
margin: 0 0 1px 25px;
padding: 5px 10px;
text-shadow: 0 1px 0 #000000;
@@ -752,7 +812,7 @@
.dataTable{
width:100%;
border-width:0;
- border:1px solid #ACAAAC;
+ border:1px solid @color_012;
.rounded(5px);
a.button,
@@ -764,30 +824,26 @@
tr {
- border-top-color: #FFFFFF;
- border-bottom-color: #525552;
- border-left-color: #FFFFFF;
- border-right-color: #525552;
- border-style: solid;
- border-width: 1px;
padding:0;
margin:0;
th{
- background-color: @color_widget_1;
- font-size:1em;
+ background-color: @color_datatable_tr_th;
+ font-size:@font_size;
font-weight:bold;
text-align:center;
- color:white;
+ color: @color_datatable_tr_th_txt;
text-shadow:none;
}
}
tbody{
- background-color: #f1f1f1;
+// background-color: #f1f1f1;
- tr{
+ // rollover rows for mouse
+ tr.odd,
+ tr.even{
border:none;
cursor:default;
@@ -805,7 +861,7 @@
}
td{
- line-height:12px;
+ line-height:( @lineheight * 0.1 );
color: @datatable_color_txt;
padding: 2px;
font-size: 10px;
@@ -976,7 +1032,7 @@
p.Ctrtirroir {
padding: 2px 10px 2px 20px;
- font-size:1.2;
+ font-size:(@font_size*1.2);
width:95.2%;
// border-color: #CCCCCC #CCCCCC -moz-use-text-color;
@@ -1065,7 +1121,7 @@
label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
- fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+ fieldset legend { color:#666666; font-size:(@font_size*1.2); font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
textarea{ vertical-align:baseline;}
@@ -1077,18 +1133,12 @@
select,
input[type="text"] {
- color: black;
margin:5px 15px;
- min-width:200px;
- border:1px solid #D7D7D7;
- .border-radius(5px,5px,5px,5px);
- .rounded(5px);
- .bw-gradient( #E4E4E4, 200, 255) ;
}
select{
padding:1px 0 0 0;
- height:20px;
- line-height:20px;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
}
}
p.new_product_img {
@@ -1097,7 +1147,7 @@
margin : 0 auto;
text-align:center;
width:98%;
- border:1px solid #ACAAAC;
+ border:1px solid @color_012;
.border-radius(5px,5px,5px,5px);
img{
@@ -1177,7 +1227,7 @@
text-align: left;
padding:0 5px;
float:left;
- background:#eee;
+// background:#eee;
}
.tabs_lang ul.ui-tabs-nav,
@@ -1213,10 +1263,11 @@
select#cPath {
margin:0;
- font-size:18px;
+ font-size:(@font_size * 1.3);
color:black;
font-weight:bold;
padding:0.2em 0.6em;
+ height: (@lineheight * 1.8) ;
&:hover {background-color: @bg_hover;cursor:pointer; }
@@ -1231,25 +1282,58 @@
/**
* Section specific Orders page
*/
- div.main-orders.block {
- width: 46%;
- margin:@margin (@margin / 2);
- background:#c9c9c9;
- .border-radius(5px,5px,5px,5px);
- .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
- }
-
- div#central table.main-orders {
- width:100%;
+ .main-orders{
+ fieldset{
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 190, 240) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .box_uniq.block_form{
+ fieldset{
+ margin:1% 2%;
+ padding:0 1%;
+ }
+
+ .w_50 {
+ width:44%;
+ }
+ }
+ block_input{
+ br,
+ span.value_edit br{display:block;height:0;}
+ }
- thead tr th{background:#303030; color:white;font-weight: normal; text-shadow: none;}
+ table.main-orders {
+ margin:1%;
+ width:98%;
+
+ thead tr th{
+ background:#303030;
+ color:#FFFFFF;
+ font-weight: normal;
+ text-shadow: none;
+ }
+
+ tr th{
+ margin:0;
+ background:#eee;
+ height:(@lineheight * 1.3);
+ line-height:(@lineheight * 1.3);
+ }
+ }
- tr th{margin:0; background:#eee; height:20px;line-height: 20px; }
+ .block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ }
}
- div#central .box_uniq.block_form.main-orders fieldset{margin:10px 0 0 0;padding:0 5px;}
- div#central .block_form.main-orders .block_input br,
- div#central .block_form.main-orders .block_input span.value_edit br{display:block;height:0;}
/* Ajsutement customer page */
div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
@@ -1258,11 +1342,39 @@
/**
* External - plugin - others
*/
+div#fancybox-outer {
+ background:none;
+ border:none !important;
+
+ div#fancybox-content {
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ .border-radius(0,5px,5px,0);
+
+ h3{
+ color:#FFFFFF;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ }
+
+
+ }
// UI
/* Layout helpers */
+ .ui-dialog {
+ .ui-widget-header{
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+ .border-radius(5px,0,0,5px);
+ }
+ .ui-dialog-content{
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ .border-radius(0,5px,5px,0);
+ }
+ }
+
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
- .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: @font_size; list-style: none; }
.ui-helper-clearfix {
zoom: 1;
@@ -1332,14 +1444,14 @@
// UI generic
.ui-widget {
font-family: Verdana,Arial,sans-serif;
- font-size: 1.1em;
+ font-size: (@font_size * 1.1);
- .ui-widget { font-size: 1em; }
+ .ui-widget { font-size: @font_size; }
- input,
- select,
- textarea,
- button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+// input,
+// select,
+// textarea,
+// button { font-family: Verdana,Arial,sans-serif; font-size: (@font_size*1.2); }
}
.ui-widget-content {
@@ -1378,22 +1490,25 @@
padding: 0;
white-space: nowrap;
- a {
+ a {
float: left;
padding: .3em 0.5em;
text-decoration: none;
cursor: pointer;
+ font-size: (@font_size*1.3);
+ font-weight : bold;
}
-
- .ui-tabs-selected {
- margin-bottom: 0;
- padding-bottom: 1px;
- }
- .ui-tabs-selected a
- .ui-tabs-selected a,
- .ui-state-disabled a,
- .ui-state-processing a { cursor: text; }
}
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ cursor: not-drop;
+ }
+ .ui-tabs-selected,
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a { cursor: not-allowed !important; }
}
.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
@@ -1409,7 +1524,7 @@
/* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
div#fancybox-inner{
- h3 { background: none repeat scroll 0 0 black; color: white; font-weight: normal; height: 21px; left: 0; line-height: 20px; padding: 0; position: absolute; text-align: center; text-shadow: none; top: 0; width: 100%;}
+ h3 { background: none repeat scroll 0 0 black; color: #FFFFFF; font-weight: normal; height: 21px; left: 0; line-height: 20px; padding: 0; position: absolute; text-align: center; text-shadow: none; top: 0; width: 100%;}
form {
float:left;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-02 15:52:45
|
Revision: 4547
http://oscss.svn.sourceforge.net/oscss/?rev=4547&view=rev
Author: oscim
Date: 2012-08-02 15:52:36 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
oubli
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/javascript/less-1.3.0.min.js
Added: branches/2.1.1/catalog/admin/includes/javascript/less-1.3.0.min.js
===================================================================
--- branches/2.1.1/catalog/admin/includes/javascript/less-1.3.0.min.js (rev 0)
+++ branches/2.1.1/catalog/admin/includes/javascript/less-1.3.0.min.js 2012-08-02 15:52:36 UTC (rev 4547)
@@ -0,0 +1,9 @@
+//
+// LESS - Leaner CSS v1.3.0
+// http://lesscss.org
+//
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+(function(a,b){function c(b){return a.less[b.split("/")[1]]}function l(){var a=document.getElementsByTagName("style");for(var b=0;b<a.length;b++)a[b].type.match(j)&&(new d.Parser).parse(a[b].innerHTML||"",function(c,d){var e=d.toCSS(),f=a[b];f.type="text/css",f.styleSheet?f.styleSheet.cssText=e:f.innerHTML=e})}function m(a,b){for(var c=0;c<d.sheets.length;c++)n(d.sheets[c],a,b,d.sheets.length-(c+1))}function n(b,c,e,f){var h=a.location.href.replace(/[#?].*$/,""),i=b.href.replace(/\?.*$/,""),j=g&&g.getItem(i),k=g&&g.getItem(i+":timestamp"),l={css:j,timestamp:k};/^(https?|file):/.test(i)||(i.charAt(0)=="/"?i=a.location.protocol+"//"+a.location.host+i:i=h.slice(0,h.lastIndexOf("/")+1)+i);var m=i.match(/([^\/]+)$/)[1];q(b.href,b.type,function(a,g){if(!e&&l&&g&&(new Date(g)).valueOf()===(new Date(l.timestamp)).valueOf())p(l.css,b),c(null,null,a,b,{local:!0,remaining:f});else try{(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/,"")],mime:b.type,filename:m})).parse(a,function(d,e){if(d)return u(d,i);try{c(d,e,a,b,{local:!1,lastModified:g,remaining:f}),s(document.getElementById("less-error-message:"+o(i)))}catch(d){u(d,i)}})}catch(h){u(h,i)}},function(a,b){throw new Error("Couldn't load "+b+" ("+a+")")})}function o(a){return a.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\?.*$/,"").replace(/\.[^\.\/]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function p(a,b,c){var d,e=b.href?b.href.replace(/\?.*$/,""):"",f="less:"+(b.title||o(e));(d=document.getElementById(f))===null&&(d=document.createElement("style"),d.type="text/css",d.media=b.media||"screen",d.id=f,document.getElementsByTagName("head")[0].appendChild(d));if(d.styleSheet)try{d.styleSheet.cssText=a}catch(h){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(a){d.childNodes.length>0?d.firstChild.nodeValue!==a.nodeValue&&d.replaceChild(a,d.firstChild):d.appendChild(a)})(document.createTextNode(a));c&&g&&(t("saving "+e+" to cache."),g.setItem(e,a),g.setItem(e+":timestamp",c))}function q(a,b,c,e){function i(b,c,d){b.status>=200&&b.status<300?c(b.responseText,b.getResponseHeader("Last-Modified")):typeof d=="function"&&d(b.status,a)}var g=r(),h=f?!1:d.async;typeof g.overrideMimeType=="function"&&g.overrideMimeType("text/css"),g.open("GET",a,h),g.setRequestHeader("Accept",b||"text/x-less, text/css; q=0.9, */*; q=0.5"),g.send(null),f?g.status===0||g.status>=200&&g.status<300?c(g.responseText):e(g.status,a):h?g.onreadystatechange=function(){g.readyState==4&&i(g,c,e)}:i(g,c,e)}function r(){if(a.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(b){return t("browser doesn't support AJAX."),null}}function s(a){return a&&a.parentNode.removeChild(a)}function t(a){d.env=="development"&&typeof console!="undefined"&&console.log("less: "+a)}function u(a,b){var c="less-error-message:"+o(b),e='<li><label>{line}</label><pre class="{class}">{content}</pre></li>',f=document.createElement("div"),g,h,i=[],j=a.filename||b;f.id=c,f.className="less-error-message",h="<h3>"+(a.message||"There is an error in your .less file")+"</h3>"+'<p>in <a href="'+j+'">'+j+"</a> ";var k=function(a,b,c){a.extract[b]&&i.push(e.replace(/\{line\}/,parseInt(a.line)+(b-1)).replace(/\{class\}/,c).replace(/\{content\}/,a.extract[b]))};a.stack?h+="<br/>"+a.stack.split("\n").slice(1).join("<br/>"):a.extract&&(k(a,0,""),k(a,1,"line"),k(a,2,""),h+="on line "+a.line+", column "+(a.column+1)+":</p>"+"<ul>"+i.join("")+"</ul>"),f.innerHTML=h,p([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),f.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env=="development"&&(g=setInterval(function(){document.body&&(document.getElementById(c)?document.body.replaceChild(f,document.getElementById(c)):document.body.insertBefore(f,document.body.firstChild),clearInterval(g))},10))}typeof define=="function"&&define.amd&&define("less",[],function(){return d}),Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"||a instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=this.length>>>0;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=this.length>>>0,c=new Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=this.length>>>0,c=0;if(b===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length,c=arguments[1]||0;if(!b)return-1;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!Object.prototype.hasOwnProperty.call(this,c))continue;if(a===this[c])return c}return-1}),Object.keys||(Object.keys=function(a){var b=[];for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&b.push(c);return b}),String.prototype.trim||(String.prototype.trim=function(){return String(this).replace(/^\s\s*/,"").replace(/\s\s*$/,"")});var d,e;typeof environment=="object"&&{}.toString.call(environment)==="[object Environment]"?(typeof a=="undefined"?d={}:d=a.less={},e=d.tree={},d.mode="rhino"):typeof a=="undefined"?(d=exports,e=c("./tree"),d.mode="node"):(typeof a.less=="undefined"&&(a.less={}),d=a.less,e=a.less.tree={},d.mode="browser"),d.Parser=function v(a){function q(){h=k[g],i=f,l=f}function r(){k[g]=h,f=i,l=f}function s(){f>l&&(k[g]=k[g].slice(f-l),l=f)}function t(a){var c,d,e,h,i,j,n,o;if(a instanceof Function)return a.call(m.parsers);if(typeof a=="string")c=b.charAt(f)===a?a:null,e=1,s();else{s();if(c=a.exec(k[g]))e=c[0].length;else return null}if(c){o=f+=e,j=f+k[g].length-e;while(f<j){h=b.charCodeAt(f);if(h!==32&&h!==10&&h!==9)break;f++}return k[g]=k[g].slice(e+(f-o)),l=f,k[g].length===0&&g<k.length-1&&g++,typeof c=="string"?c:c.length===1?c[0]:c}}function u(a,c){var d=t(a);if(!d)v(c||(typeof a=="string"?"expected '"+a+"' got '"+b.charAt(f)+"'":"unexpected token"));else return d}function v(a,b){throw{index:f,type:b||"Syntax",message:a}}function w(a){return typeof a=="string"?b.charAt(f)===a:a.test(k[g])?!0:!1}function x(a){return d.mode==="node"?c("path").basename(a):a.match(/[^\/]+$/)[0]}function y(a,c){return a.filename&&c.filename&&a.filename!==c.filename?m.imports.contents[x(a.filename)]:b}function z(a,b){for(var c=a,d=-1;c>=0&&b.charAt(c)!=="\n";c--)d++;return{line:typeof a=="number"?(b.slice(0,a).match(/\n/g)||"").length:null,column:d}}function A(a,b){var c=y(a,b),d=z(a.index,c),e=d.line,f=d.column,g=c.split("\n");this.type=a.type||"Syntax",this.message=a.message,this.filename=a.filename||b.filename,this.index=a.index,this.line=typeof e=="number"?e+1:null,this.callLine=a.call&&z(a.call,c).line+1,this.callExtract=g[z(a.call,c).line],this.stack=a.stack,this.column=f,this.extract=[g[e-1],g[e],g[e+1]]}var b,f,g,h,i,j,k,l,m,n=this,o=function(){},p=this.imports={paths:a&&a.paths||[],queue:[],files:{},contents:{},mime:a&&a.mime,error:null,push:function(b,c){var e=this;this.queue.push(b),d.Parser.importer(b,this.paths,function(a,d,f){e.queue.splice(e.queue.indexOf(b),1),e.files[b]=d,e.contents[b]=f,a&&!e.error&&(e.error=a),c(a,d),e.queue.length===0&&o()},a)}};return this.env=a=a||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null,m={imports:p,parse:function(h,i){var n,p,q,r,s,u,v=[],w,x=null;f=g=l=j=0,b=h.replace(/\r\n/g,"\n"),k=function(c){var d=0,e=/[^"'`\{\}\/\(\)\\]+/g,f=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`\\\r\n]|\\.)*)`/g,h=0,i,j=c[0],k;for(var l=0,m,n;l<b.length;l++){e.lastIndex=l,(i=e.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0])),m=b.charAt(l),f.lastIndex=g.lastIndex=l,(i=g.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)),!k&&m==="/"&&(n=b.charAt(l+1),(n==="/"||n==="*")&&(i=f.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)));switch(m){case"{":if(!k){h++,j.push(m);break};case"}":if(!k){h--,j.push(m),c[++d]=j=[];break};case"(":if(!k){k=!0,j.push(m);break};case")":if(k){k=!1,j.push(m);break};default:j.push(m)}}return h>0&&(x=new A({index:l,type:"Parse",message:"missing closing `}`",filename:a.filename},a)),c.map(function(a){return a.join("")})}([[]]);if(x)return i(x);try{n=new e.Ruleset([],t(this.parsers.primary)),n.root=!0}catch(y){return i(new A(y,a))}n.toCSS=function(b){var f,g,h;return function(f,g){var h=[],i;f=f||{},typeof g=="object"&&!Array.isArray(g)&&(g=Object.keys(g).map(function(a){var b=g[a];return b instanceof e.Value||(b instanceof e.Expression||(b=new e.Expression([b])),b=new e.Value([b])),new e.Rule("@"+a,b,!1,0)}),h=[new e.Ruleset(null,g)]);try{var j=b.call(this,{frames:h}).toCSS([],{compress:f.compress||!1})}catch(k){throw new A(k,a)}if(i=m.imports.error)throw i instanceof A?i:new A(i,a);return f.yuicompress&&d.mode==="node"?c("./cssmin").compressor.cssmin(j):f.compress?j.replace(/(\s)+/g,"$1"):j}}(n.eval);if(f<b.length-1){f=j,u=b.split("\n"),s=(b.slice(0,f).match(/\n/g)||"").length+1;for(var z=f,B=-1;z>=0&&b.charAt(z)!=="\n";z--)B++;x={type:"Parse",message:"Syntax Error on line "+s,index:f,filename:a.filename,line:s,column:B,extract:[u[s-2],u[s-1],u[s]]}}this.imports.queue.length>0?o=function(){i(x,n)}:i(x,n)},parsers:{primary:function(){var a,b=[];while((a=t(this.mixin.definition)||t(this.rule)||t(this.ruleset)||t(this.mixin.call)||t(this.comment)||t(this.directive))||t(/^[\s\n]+/))a&&b.push(a);return b},comment:function(){var a;if(b.charAt(f)!=="/")return;if(b.charAt(f+1)==="/")return new e.Comment(t(/^\/\/.*/),!0);if(a=t(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)},entities:{quoted:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=='"'&&b.charAt(c)!=="'")return;d&&t("~");if(a=t(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0],a[1]||a[2],d)},keyword:function(){var a;if(a=t(/^[_A-Za-z-][_A-Za-z0-9-]*/))return e.colors.hasOwnProperty(a)?new e.Color(e.colors[a].slice(1)):new e.Keyword(a)},call:function(){var b,c,d=f;if(!(b=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(k[g])))return;b=b[1].toLowerCase();if(b==="url")return null;f+=b.length;if(b==="alpha")return t(this.alpha);t("("),c=t(this.entities.arguments);if(!t(")"))return;if(b)return new e.Call(b,c,d,a.filename)},arguments:function(){var a=[],b;while(b=t(this.entities.assignment)||t(this.expression)){a.push(b);if(!t(","))break}return a},literal:function(){return t(this.entities.dimension)||t(this.entities.color)||t(this.entities.quoted)},assignment:function(){var a,b;if((a=t(/^\w+(?=\s?=)/i))&&t("=")&&(b=t(this.entity)))return new e.Assignment(a,b)},url:function(){var a;if(b.charAt(f)!=="u"||!t(/^url\(/))return;return a=t(this.entities.quoted)||t(this.entities.variable)||t(this.entities.dataURI)||t(/^[-\w%@$\/.&=:;#+?~]+/)||"",u(")"),new e.URL(a.value||a.data||a instanceof e.Variable?a:new e.Anonymous(a),p.paths)},dataURI:function(){var a;if(t(/^data:/)){a={},a.mime=t(/^[^\/]+\/[^,;)]+/)||"",a.charset=t(/^;\s*charset=[^,;)]+/)||"",a.base64=t(/^;\s*base64/)||"",a.data=t(/^,\s*[^)]+/);if(a.data)return a}},variable:function(){var c,d=f;if(b.charAt(f)==="@"&&(c=t(/^@@?[\w-]+/)))return new e.Variable(c,d,a.filename)},color:function(){var a;if(b.charAt(f)==="#"&&(a=t(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])},dimension:function(){var a,c=b.charCodeAt(f);if(c>57||c<45||c===47)return;if(a=t(/^(-?\d*\.?\d+)(px|%|em|rem|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1],a[2])},javascript:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=="`")return;d&&t("~");if(a=t(/^`([^`]*)`/))return new e.JavaScript(a[1],f,d)}},variable:function(){var a;if(b.charAt(f)==="@"&&(a=t(/^(@[\w-]+)\s*:/)))return a[1]},shorthand:function(){var a,b;if(!w(/^[@\w.%-]+\/[@\w.-]+/))return;if((a=t(this.entity))&&t("/")&&(b=t(this.entity)))return new e.Shorthand(a,b)},mixin:{call:function(){var c=[],d,g,h,i=f,j=b.charAt(f),k=!1;if(j!=="."&&j!=="#")return;while(d=t(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))c.push(new e.Element(g,d,f)),g=t(">");t("(")&&(h=t(this.entities.arguments))&&t(")"),t(this.important)&&(k=!0);if(c.length>0&&(t(";")||w("}")))return new e.mixin.Call(c,h||[],i,a.filename,k)},definition:function(){var a,c=[],d,g,h,i,j,k=!1;if(b.charAt(f)!=="."&&b.charAt(f)!=="#"||w(/^[^{]*(;|})/))return;q();if(d=t(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)){a=d[1];do{if(b.charAt(f)==="."&&t(/^\.{3}/)){k=!0;break}if(!(h=t(this.entities.variable)||t(this.entities.literal)||t(this.entities.keyword)))break;if(h instanceof e.Variable)if(t(":"))i=u(this.expression,"expected expression"),c.push({name:h.name,value:i});else{if(t(/^\.{3}/)){c.push({name:h.name,variadic:!0}),k=!0;break}c.push({name:h.name})}else c.push({value:h})}while(t(","));u(")"),t(/^when/)&&(j=u(this.conditions,"expected condition")),g=t(this.block);if(g)return new e.mixin.Definition(a,c,g,j,k);r()}}},entity:function(){return t(this.entities.literal)||t(this.entities.variable)||t(this.entities.url)||t(this.entities.call)||t(this.entities.keyword)||t(this.entities.javascript)||t(this.comment)},end:function(){return t(";")||w("}")},alpha:function(){var a;if(!t(/^\(opacity=/i))return;if(a=t(/^\d+/)||t(this.entities.variable))return u(")"),new e.Alpha(a)},element:function(){var a,b,c,d;c=t(this.combinator),a=t(/^(?:\d+\.\d+|\d+)%/)||t(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)||t("*")||t(this.attribute)||t(/^\([^)@]+\)/),a||t("(")&&(d=t(this.entities.variable))&&t(")")&&(a=new e.Paren(d));if(a)return new e.Element(c,a,f);if(c.value&&c.value.charAt(0)==="&")return new e.Element(c,null,f)},combinator:function(){var a,c=b.charAt(f);if(c===">"||c==="+"||c==="~"){f++;while(b.charAt(f)===" ")f++;return new e.Combinator(c)}if(c==="&"){a="&",f++,b.charAt(f)===" "&&(a="& ");while(b.charAt(f)===" ")f++;return new e.Combinator(a)}return b.charAt(f-1)===" "?new e.Combinator(" "):new e.Combinator(null)},selector:function(){var a,c,d=[],g,h;if(t("("))return a=t(this.entity),u(")"),new e.Selector([new e.Element("",a,f)]);while(c=t(this.element)){g=b.charAt(f),d.push(c);if(g==="{"||g==="}"||g===";"||g===",")break}if(d.length>0)return new e.Selector(d)},tag:function(){return t(/^[a-zA-Z][a-zA-Z-]*[0-9]?/)||t("*")},attribute:function(){var a="",b,c,d;if(!t("["))return;if(b=t(/^[a-zA-Z-]+/)||t(this.entities.quoted))(d=t(/^[|~*$^]?=/))&&(c=t(this.entities.quoted)||t(/^[\w-]+/))?a=[b,d,c.toCSS?c.toCSS():c].join(""):a=b;if(!t("]"))return;if(a)return"["+a+"]"},block:function(){var a;if(t("{")&&(a=t(this.primary))&&t("}"))return a},ruleset:function(){var b=[],c,d,g;q();while(c=t(this.selector)){b.push(c),t(this.comment);if(!t(","))break;t(this.comment)}if(b.length>0&&(d=t(this.block)))return new e.Ruleset(b,d,a.strictImports);j=f,r()},rule:function(){var a,c,d=b.charAt(f),h,l;q();if(d==="."||d==="#"||d==="&")return;if(a=t(this.variable)||t(this.property)){a.charAt(0)!="@"&&(l=/^([^@+\/'"*`(;{}-]*);/.exec(k[g]))?(f+=l[0].length-1,c=new e.Anonymous(l[1])):a==="font"?c=t(this.font):c=t(this.value),h=t(this.important);if(c&&t(this.end))return new e.Rule(a,c,h,i);j=f,r()}},"import":function(){var a,b,c=f;if(t(/^@import\s+/)&&(a=t(this.entities.quoted)||t(this.entities.url))){b=t(this.mediaFeatures);if(t(";"))return new e.Import(a,p,b,c)}},mediaFeature:function(){var a,b,c=[];do if(a=t(this.entities.keyword))c.push(a);else if(t("(")){b=t(this.property),a=t(this.entity);if(!t(")"))return null;if(b&&a)c.push(new e.Paren(new e.Rule(b,a,null,f,!0)));else if(a)c.push(new e.Paren(a));else return null}while(a);if(c.length>0)return new e.Expression(c)},mediaFeatures:function(){var a,b=[];do if(a=t(this.mediaFeature)){b.push(a);if(!t(","))break}else if(a=t(this.entities.variable)){b.push(a);if(!t(","))break}while(a);return b.length>0?b:null},media:function(){var a,b;if(t(/^@media/)){a=t(this.mediaFeatures);if(b=t(this.block))return new e.Media(b,a)}},directive:function(){var a,c,d,g,h,i;if(b.charAt(f)!=="@")return;if(c=t(this["import"])||t(this.media))return c;if(a=t(/^@page|@keyframes/)||t(/^@(?:-webkit-|-moz-|-o-|-ms-)[a-z0-9-]+/)){g=(t(/^[^{]+/)||"").trim();if(d=t(this.block))return new e.Directive(a+" "+g,d)}else if(a=t(/^@[-a-z]+/))if(a==="@font-face"){if(d=t(this.block))return new e.Directive(a,d)}else if((c=t(this.entity))&&t(";"))return new e.Directive(a,c)},font:function(){var a=[],b=[],c,d,f,g;while(g=t(this.shorthand)||t(this.entity))b.push(g);a.push(new e.Expression(b));if(t(","))while(g=t(this.expression)){a.push(g);if(!t(","))break}return new e.Value(a)},value:function(){var a,b=[],c;while(a=t(this.expression)){b.push(a);if(!t(","))break}if(b.length>0)return new e.Value(b)},important:function(){if(b.charAt(f)==="!")return t(/^! *important/)},sub:function(){var a;if(t("(")&&(a=t(this.expression))&&t(")"))return a},multiplication:function(){var a,b,c,d;if(a=t(this.operand)){while(!w(/^\/\*/)&&(c=t("/")||t("*"))&&(b=t(this.operand)))d=new e.Operation(c,[d||a,b]);return d||a}},addition:function(){var a,c,d,g;if(a=t(this.multiplication)){while((d=t(/^[-+]\s+/)||b.charAt(f-1)!=" "&&(t("+")||t("-")))&&(c=t(this.multiplication)))g=new e.Operation(d,[g||a,c]);return g||a}},conditions:function(){var a,b,c=f,d;if(a=t(this.condition)){while(t(",")&&(b=t(this.condition)))d=new e.Condition("or",d||a,b,c);return d||a}},condition:function(){var a,b,c,d,g=f,h=!1;t(/^not/)&&(h=!0),u("(");if(a=t(this.addition)||t(this.entities.keyword)||t(this.entities.quoted))return(d=t(/^(?:>=|=<|[<=>])/))?(b=t(this.addition)||t(this.entities.keyword)||t(this.entities.quoted))?c=new e.Condition(d,a,b,g,h):v("expected expression"):c=new e.Condition("=",a,new e.Keyword("true"),g,h),u(")"),t(/^and/)?new e.Condition("and",c,t(this.condition)):c},operand:function(){var a,c=b.charAt(f+1);b.charAt(f)==="-"&&(c==="@"||c==="(")&&(a=t("-"));var d=t(this.sub)||t(this.entities.dimension)||t(this.entities.color)||t(this.entities.variable)||t(this.entities.call);return a?new e.Operation("*",[new e.Dimension(-1),d]):d},expression:function(){var a,b,c=[],d;while(a=t(this.addition)||t(this.entity))c.push(a);if(c.length>0)return new e.Expression(c)},property:function(){var a;if(a=t(/^(\*?-?[-a-z_0-9]+)\s*:/))return a[1]}}}};if(d.mode==="browser"||d.mode==="rhino")d.Parser.importer=function(a,b,c,d){!/^([a-z]+:)?\//.test(a)&&b.length>0&&(a=b[0]+a),n({href:a,title:a,type:d.mime},function(e){e&&typeof d.errback=="function"?d.errback.call(null,a,b,c,d):c.apply(null,arguments)},!0)};(function(a){function b(b){return a.functions.hsla(b.h,b.s,b.l,b.a)}function c(b){if(b instanceof a.Dimension)return parseFloat(b.unit=="%"?b.value/100:b.value);if(typeof b=="number")return b;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function d(a){return Math.min(1,Math.max(0,a))}a.functions={rgb:function(a,b,c){return this.rgba(a,b,c,1)},rgba:function(b,d,e,f){var g=[b,d,e].map(function(a){return c(a)}),f=c(f);return new a.Color(g,f)},hsl:function(a,b,c){return this.hsla(a,b,c,1)},hsla:function(a,b,d,e){function h(a){return a=a<0?a+1:a>1?a-1:a,a*6<1?g+(f-g)*a*6:a*2<1?f:a*3<2?g+(f-g)*(2/3-a)*6:g}a=c(a)%360/360,b=c(b),d=c(d),e=c(e);var f=d<=.5?d*(b+1):d+b-d*b,g=d*2-f;return this.rgba(h(a+1/3)*255,h(a)*255,h(a-1/3)*255,e)},hue:function(b){return new a.Dimension(Math.round(b.toHSL().h))},saturation:function(b){return new a.Dimension(Math.round(b.toHSL().s*100),"%")},lightness:function(b){return new a.Dimension(Math.round(b.toHSL().l*100),"%")},alpha:function(b){return new a.Dimension(b.toHSL().a)},saturate:function(a,c){var e=a.toHSL();return e.s+=c.value/100,e.s=d(e.s),b(e)},desaturate:function(a,c){var e=a.toHSL();return e.s-=c.value/100,e.s=d(e.s),b(e)},lighten:function(a,c){var e=a.toHSL();return e.l+=c.value/100,e.l=d(e.l),b(e)},darken:function(a,c){var e=a.toHSL();return e.l-=c.value/100,e.l=d(e.l),b(e)},fadein:function(a,c){var e=a.toHSL();return e.a+=c.value/100,e.a=d(e.a),b(e)},fadeout:function(a,c){var e=a.toHSL();return e.a-=c.value/100,e.a=d(e.a),b(e)},fade:function(a,c){var e=a.toHSL();return e.a=c.value/100,e.a=d(e.a),b(e)},spin:function(a,c){var d=a.toHSL(),e=(d.h+c.value)%360;return d.h=e<0?360+e:e,b(d)},mix:function(b,c,d){var e=d.value/100,f=e*2-1,g=b.toHSL().a-c.toHSL().a,h=((f*g==-1?f:(f+g)/(1+f*g))+1)/2,i=1-h,j=[b.rgb[0]*h+c.rgb[0]*i,b.rgb[1]*h+c.rgb[1]*i,b.rgb[2]*h+c.rgb[2]*i],k=b.alpha*e+c.alpha*(1-e);return new a.Color(j,k)},greyscale:function(b){return this.desaturate(b,new a.Dimension(100))},e:function(b){return new a.Anonymous(b instanceof a.JavaScript?b.evaluated:b)},escape:function(b){return new a.Anonymous(encodeURI(b.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/\(/g,"%28").replace(/\)/g,"%29"))},"%":function(b){var c=Array.prototype.slice.call(arguments,1),d=b.value;for(var e=0;e<c.length;e++)d=d.replace(/%[sda]/i,function(a){var b=a.match(/s/i)?c[e].value:c[e].toCSS();return a.match(/[A-Z]$/)?encodeURIComponent(b):b});return d=d.replace(/%%/g,"%"),new a.Quoted('"'+d+'"',d)},round:function(a){return this._math("round",a)},ceil:function(a){return this._math("ceil",a)},floor:function(a){return this._math("floor",a)},_math:function(b,d){if(d instanceof a.Dimension)return new a.Dimension(Math[b](c(d)),d.unit);if(typeof d=="number")return Math[b](d);throw{type:"Argument",message:"argument must be a number"}},argb:function(b){return new a.Anonymous(b.toARGB())},percentage:function(b){return new a.Dimension(b.value*100,"%")},color:function(b){if(b instanceof a.Quoted)return new a.Color(b.value.slice(1));throw{type:"Argument",message:"argument must be a string"}},iscolor:function(b){return this._isa(b,a.Color)},isnumber:function(b){return this._isa(b,a.Dimension)},isstring:function(b){return this._isa(b,a.Quoted)},iskeyword:function(b){return this._isa(b,a.Keyword)},isurl:function(b){return this._isa(b,a.URL)},ispixel:function(b){return b instanceof a.Dimension&&b.unit==="px"?a.True:a.False},ispercentage:function(b){return b instanceof a.Dimension&&b.unit==="%"?a.True:a.False},isem:function(b){return b instanceof a.Dimension&&b.unit==="em"?a.True:a.False},_isa:function(b,c){return b instanceof c?a.True:a.False}}})(c("./tree")),function(a){a.colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"}}(c("./tree")),function(a){a.Alpha=function(a){this.value=a},a.Alpha.prototype={toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"},eval:function(a){return this.value.eval&&(this.value=this.value.eval(a)),this}}}(c("../tree")),function(a){a.Anonymous=function(a){this.value=a.value||a},a.Anonymous.prototype={toCSS:function(){return this.value},eval:function(){return this}}}(c("../tree")),function(a){a.Assignment=function(a,b){this.key=a,this.value=b},a.Assignment.prototype={toCSS:function(){return this.key+"="+(this.value.toCSS?this.value.toCSS():this.value)},eval:function(a){return this.value.eval&&(this.value=this.value.eval(a)),this}}}(c("../tree")),function(a){a.Call=function(a,b,c,d){this.name=a,this.args=b,this.index=c,this.filename=d},a.Call.prototype={eval:function(b){var c=this.args.map(function(a){return a.eval(b)});if(!(this.name in a.functions))return new a.Anonymous(this.name+"("+c.map(function(a){return a.toCSS()}).join(", ")+")");try{return a.functions[this.name].apply(a.functions,c)}catch(d){throw{type:d.type||"Runtime",message:"error evaluating function `"+this.name+"`"+(d.message?": "+d.message:""),index:this.index,filename:this.filename}}},toCSS:function(a){return this.eval(a).toCSS()}}}(c("../tree")),function(a){a.Color=function(a,b){Array.isArray(a)?this.rgb=a:a.length==6?this.rgb=a.match(/.{2}/g).map(function(a){return parseInt(a,16)}):this.rgb=a.split("").map(function(a){return parseInt(a+a,16)}),this.alpha=typeof b=="number"?b:1},a.Color.prototype={eval:function(){return this},toCSS:function(){return this.alpha<1?"rgba("+this.rgb.map(function(a){return Math.round(a)}).concat(this.alpha).join(", ")+")":"#"+this.rgb.map(function(a){return a=Math.round(a),a=(a>255?255:a<0?0:a).toString(16),a.length===1?"0"+a:a}).join("")},operate:function(b,c){var d=[];c instanceof a.Color||(c=c.toColor());for(var e=0;e<3;e++)d[e]=a.operate(b,this.rgb[e],c.rgb[e]);return new a.Color(d,this.alpha+c.alpha)},toHSL:function(){var a=this.rgb[0]/255,b=this.rgb[1]/255,c=this.rgb[2]/255,d=this.alpha,e=Math.max(a,b,c),f=Math.min(a,b,c),g,h,i=(e+f)/2,j=e-f;if(e===f)g=h=0;else{h=i>.5?j/(2-e-f):j/(e+f);switch(e){case a:g=(b-c)/j+(b<c?6:0);break;case b:g=(c-a)/j+2;break;case c:g=(a-b)/j+4}g/=6}return{h:g*360,s:h,l:i,a:d}},toARGB:function(){var a=[Math.round(this.alpha*255)].concat(this.rgb);return"#"+a.map(function(a){return a=Math.round(a),a=(a>255?255:a<0?0:a).toString(16),a.length===1?"0"+a:a}).join("")}}}(c("../tree")),function(a){a.Comment=function(a,b){this.value=a,this.silent=!!b},a.Comment.prototype={toCSS:function(a){return a.compress?"":this.value},eval:function(){return this}}}(c("../tree")),function(a){a.Condition=function(a,b,c,d,e){this.op=a.trim(),this.lvalue=b,this.rvalue=c,this.index=d,this.negate=e},a.Condition.prototype.eval=function(a){var b=this.lvalue.eval(a),c=this.rvalue.eval(a),d=this.index,e,e=function(a){switch(a){case"and":return b&&c;case"or":return b||c;default:if(b.compare)e=b.compare(c);else if(c.compare)e=c.compare(b);else throw{type:"Type",message:"Unable to perform comparison",index:d};switch(e){case-1:return a==="<"||a==="=<";case 0:return a==="="||a===">="||a==="=<";case 1:return a===">"||a===">="}}}(this.op);return this.negate?!e:e}}(c("../tree")),function(a){a.Dimension=function(a,b){this.value=parseFloat(a),this.unit=b||null},a.Dimension.prototype={eval:function(){return this},toColor:function(){return new a.Color([this.value,this.value,this.value])},toCSS:function(){var a=this.value+this.unit;return a},operate:function(b,c){return new a.Dimension(a.operate(b,this.value,c.value),this.unit||c.unit)},compare:function(b){return b instanceof a.Dimension?b.value>this.value?-1:b.value<this.value?1:0:-1}}}(c("../tree")),function(a){a.Directive=function(b,c,d){this.name=b,Array.isArray(c)?(this.ruleset=new a.Ruleset([],c),this.ruleset.allowImports=!0):this.value=c},a.Directive.prototype={toCSS:function(a,b){return this.ruleset?(this.ruleset.root=!0,this.name+(b.compress?"{":" {\n ")+this.ruleset.toCSS(a,b).trim().replace(/\n/g,"\n ")+(b.compress?"}":"\n}\n")):this.name+" "+this.value.toCSS()+";\n"},eval:function(a){return a.frames.unshift(this),this.ruleset=this.ruleset&&this.ruleset.eval(a),a.frames.shift(),this},variable:function(b){return a.Ruleset.prototype.variable.call(this.ruleset,b)},find:function(){return a.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return a.Ruleset.prototype.rulesets.apply(this.ruleset)}}}(c("../tree")),function(a){a.Element=function(b,c,d){this.combinator=b instanceof a.Combinator?b:new a.Combinator(b),typeof c=="string"?this.value=c.trim():c?this.value=c:this.value="",this.index=d},a.Element.prototype.eval=function(b){return new a.Element(this.combinator,this.value.eval?this.value.eval(b):this.value,this.index)},a.Element.prototype.toCSS=function(a){return this.combinator.toCSS(a||{})+(this.value.toCSS?this.value.toCSS(a):this.value)},a.Combinator=function(a){a===" "?this.value=" ":a==="& "?this.value="& ":this.value=a?a.trim():""},a.Combinator.prototype.toCSS=function(a){return{"":""," ":" ","&":"","& ":" ",":":" :","+":a.compress?"+":" + ","~":a.compress?"~":" ~ ",">":a.compress?">":" > "}[this.value]}}(c("../tree")),function(a){a.Expression=function(a){this.value=a},a.Expression.prototype={eval:function(b){return this.value.length>1?new a.Expression(this.value.map(function(a){return a.eval(b)})):this.value.length===1?this.value[0].eval(b):this},toCSS:function(a){return this.value.map(function(b){return b.toCSS?b.toCSS(a):""}).join(" ")}}}(c("../tree")),function(a){a.Import=function(b,c,d,e){var f=this;this.index=e,this._path=b,this.features=d&&new a.Value(d),b instanceof a.Quoted?this.path=/\.(le?|c)ss(\?.*)?$/.test(b.value)?b.value:b.value+".less":this.path=b.value.value||b.value,this.css=/css(\?.*)?$/.test(this.path),this.css||c.push(this.path,function(b,c){b&&(b.index=e),f.root=c||new a.Ruleset([],[])})},a.Import.prototype={toCSS:function(a){var b=this.features?" "+this.features.toCSS(a):"";return this.css?"@import "+this._path.toCSS()+b+";\n":""},eval:function(b){var c,d=this.features&&this.features.eval(b);if(this.css)return this;c=new a.Ruleset([],this.root.rules.slice(0));for(var e=0;e<c.rules.length;e++)c.rules[e]instanceof a.Import&&Array.prototype
+.splice.apply(c.rules,[e,1].concat(c.rules[e].eval(b)));return this.features?new a.Media(c.rules,this.features.value):c.rules}}}(c("../tree")),function(a){a.JavaScript=function(a,b,c){this.escaped=c,this.expression=a,this.index=b},a.JavaScript.prototype={eval:function(b){var c,d=this,e={},f=this.expression.replace(/@\{([\w-]+)\}/g,function(c,e){return a.jsify((new a.Variable("@"+e,d.index)).eval(b))});try{f=new Function("return ("+f+")")}catch(g){throw{message:"JavaScript evaluation error: `"+f+"`",index:this.index}}for(var h in b.frames[0].variables())e[h.slice(1)]={value:b.frames[0].variables()[h].value,toJS:function(){return this.value.eval(b).toCSS()}};try{c=f.call(e)}catch(g){throw{message:"JavaScript evaluation error: '"+g.name+": "+g.message+"'",index:this.index}}return typeof c=="string"?new a.Quoted('"'+c+'"',c,this.escaped,this.index):Array.isArray(c)?new a.Anonymous(c.join(", ")):new a.Anonymous(c)}}}(c("../tree")),function(a){a.Keyword=function(a){this.value=a},a.Keyword.prototype={eval:function(){return this},toCSS:function(){return this.value},compare:function(b){return b instanceof a.Keyword?b.value===this.value?0:1:-1}},a.True=new a.Keyword("true"),a.False=new a.Keyword("false")}(c("../tree")),function(a){a.Media=function(b,c){var d=new a.Element("&",null,0),e=[new a.Selector([d])];this.features=new a.Value(c),this.ruleset=new a.Ruleset(e,b),this.ruleset.allowImports=!0},a.Media.prototype={toCSS:function(a,b){var c=this.features.toCSS(b);return this.ruleset.root=a.length===0||a[0].multiMedia,"@media "+c+(b.compress?"{":" {\n ")+this.ruleset.toCSS(a,b).trim().replace(/\n/g,"\n ")+(b.compress?"}":"\n}\n")},eval:function(b){b.mediaBlocks||(b.mediaBlocks=[],b.mediaPath=[]);var c=b.mediaBlocks.length;b.mediaPath.push(this),b.mediaBlocks.push(this);var d=new a.Media([],[]);return d.features=this.features.eval(b),b.frames.unshift(this.ruleset),d.ruleset=this.ruleset.eval(b),b.frames.shift(),b.mediaBlocks[c]=d,b.mediaPath.pop(),b.mediaPath.length===0?d.evalTop(b):d.evalNested(b)},variable:function(b){return a.Ruleset.prototype.variable.call(this.ruleset,b)},find:function(){return a.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return a.Ruleset.prototype.rulesets.apply(this.ruleset)},evalTop:function(b){var c=this;if(b.mediaBlocks.length>1){var d=new a.Element("&",null,0),e=[new a.Selector([d])];c=new a.Ruleset(e,b.mediaBlocks),c.multiMedia=!0}return delete b.mediaBlocks,delete b.mediaPath,c},evalNested:function(b){var c,d,e=b.mediaPath.concat([this]);for(c=0;c<e.length;c++)d=e[c].features instanceof a.Value?e[c].features.value:e[c].features,e[c]=Array.isArray(d)?d:[d];return this.features=new a.Value(this.permute(e).map(function(b){b=b.map(function(b){return b.toCSS?b:new a.Anonymous(b)});for(c=b.length-1;c>0;c--)b.splice(c,0,new a.Anonymous("and"));return new a.Expression(b)})),new a.Ruleset([],[])},permute:function(a){if(a.length===0)return[];if(a.length===1)return a[0];var b=[],c=this.permute(a.slice(1));for(var d=0;d<c.length;d++)for(var e=0;e<a[0].length;e++)b.push([a[0][e]].concat(c[d]));return b}}}(c("../tree")),function(a){a.mixin={},a.mixin.Call=function(b,c,d,e,f){this.selector=new a.Selector(b),this.arguments=c,this.index=d,this.filename=e,this.important=f},a.mixin.Call.prototype={eval:function(a){var b,c,d=[],e=!1;for(var f=0;f<a.frames.length;f++)if((b=a.frames[f].find(this.selector)).length>0){c=this.arguments&&this.arguments.map(function(b){return b.eval(a)});for(var g=0;g<b.length;g++)if(b[g].match(c,a))try{Array.prototype.push.apply(d,b[g].eval(a,this.arguments,this.important).rules),e=!0}catch(h){throw{message:h.message,index:this.index,filename:this.filename,stack:h.stack}}if(e)return d;throw{type:"Runtime",message:"No matching definition was found for `"+this.selector.toCSS().trim()+"("+this.arguments.map(function(a){return a.toCSS()}).join(", ")+")`",index:this.index,filename:this.filename}}throw{type:"Name",message:this.selector.toCSS().trim()+" is undefined",index:this.index,filename:this.filename}}},a.mixin.Definition=function(b,c,d,e,f){this.name=b,this.selectors=[new a.Selector([new a.Element(null,b)])],this.params=c,this.condition=e,this.variadic=f,this.arity=c.length,this.rules=d,this._lookups={},this.required=c.reduce(function(a,b){return!b.name||b.name&&!b.value?a+1:a},0),this.parent=a.Ruleset.prototype,this.frames=[]},a.mixin.Definition.prototype={toCSS:function(){return""},variable:function(a){return this.parent.variable.call(this,a)},variables:function(){return this.parent.variables.call(this)},find:function(){return this.parent.find.apply(this,arguments)},rulesets:function(){return this.parent.rulesets.apply(this)},evalParams:function(b,c){var d=new a.Ruleset(null,[]),e;for(var f=0,g,h;f<this.params.length;f++)if(h=this.params[f].name)if(this.params[f].variadic&&c){e=[];for(var i=f;i<c.length;i++)e.push(c[i].eval(b));d.rules.unshift(new a.Rule(h,(new a.Expression(e)).eval(b)))}else if(g=c&&c[f]||this.params[f].value)d.rules.unshift(new a.Rule(h,g.eval(b)));else throw{type:"Runtime",message:"wrong number of arguments for "+this.name+" ("+c.length+" for "+this.arity+")"};return d},eval:function(b,c,d){var e=this.evalParams(b,c),f,g=[],h,i;for(var j=0;j<Math.max(this.params.length,c&&c.length);j++)g.push(c[j]||this.params[j].value);return e.rules.unshift(new a.Rule("@arguments",(new a.Expression(g)).eval(b))),h=d?this.rules.map(function(b){return new a.Rule(b.name,b.value,"!important",b.index)}):this.rules.slice(0),(new a.Ruleset(null,h)).eval({frames:[this,e].concat(this.frames,b.frames)})},match:function(a,b){var c=a&&a.length||0,d,e;if(!this.variadic){if(c<this.required)return!1;if(c>this.params.length)return!1;if(this.required>0&&c>this.params.length)return!1}if(this.condition&&!this.condition.eval({frames:[this.evalParams(b,a)].concat(b.frames)}))return!1;d=Math.min(c,this.arity);for(var f=0;f<d;f++)if(!this.params[f].name&&a[f].eval(b).toCSS()!=this.params[f].value.eval(b).toCSS())return!1;return!0}}}(c("../tree")),function(a){a.Operation=function(a,b){this.op=a.trim(),this.operands=b},a.Operation.prototype.eval=function(b){var c=this.operands[0].eval(b),d=this.operands[1].eval(b),e;if(c instanceof a.Dimension&&d instanceof a.Color)if(this.op==="*"||this.op==="+")e=d,d=c,c=e;else throw{name:"OperationError",message:"Can't substract or divide a color from a number"};return c.operate(this.op,d)},a.operate=function(a,b,c){switch(a){case"+":return b+c;case"-":return b-c;case"*":return b*c;case"/":return b/c}}}(c("../tree")),function(a){a.Paren=function(a){this.value=a},a.Paren.prototype={toCSS:function(a){return"("+this.value.toCSS(a)+")"},eval:function(b){return new a.Paren(this.value.eval(b))}}}(c("../tree")),function(a){a.Quoted=function(a,b,c,d){this.escaped=c,this.value=b||"",this.quote=a.charAt(0),this.index=d},a.Quoted.prototype={toCSS:function(){return this.escaped?this.value:this.quote+this.value+this.quote},eval:function(b){var c=this,d=this.value.replace(/`([^`]+)`/g,function(d,e){return(new a.JavaScript(e,c.index,!0)).eval(b).value}).replace(/@\{([\w-]+)\}/g,function(d,e){var f=(new a.Variable("@"+e,c.index)).eval(b);return"value"in f?f.value:f.toCSS()});return new a.Quoted(this.quote+d+this.quote,d,this.escaped,this.index)}}}(c("../tree")),function(a){a.Rule=function(b,c,d,e,f){this.name=b,this.value=c instanceof a.Value?c:new a.Value([c]),this.important=d?" "+d.trim():"",this.index=e,this.inline=f||!1,b.charAt(0)==="@"?this.variable=!0:this.variable=!1},a.Rule.prototype.toCSS=function(a){return this.variable?"":this.name+(a.compress?":":": ")+this.value.toCSS(a)+this.important+(this.inline?"":";")},a.Rule.prototype.eval=function(b){return new a.Rule(this.name,this.value.eval(b),this.important,this.index,this.inline)},a.Shorthand=function(a,b){this.a=a,this.b=b},a.Shorthand.prototype={toCSS:function(a){return this.a.toCSS(a)+"/"+this.b.toCSS(a)},eval:function(){return this}}}(c("../tree")),function(a){a.Ruleset=function(a,b,c){this.selectors=a,this.rules=b,this._lookups={},this.strictImports=c},a.Ruleset.prototype={eval:function(b){var c=this.selectors&&this.selectors.map(function(a){return a.eval(b)}),d=new a.Ruleset(c,this.rules.slice(0),this.strictImports);d.root=this.root,d.allowImports=this.allowImports,b.frames.unshift(d);if(d.root||d.allowImports||!d.strictImports)for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.Import&&Array.prototype.splice.apply(d.rules,[e,1].concat(d.rules[e].eval(b)));for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.mixin.Definition&&(d.rules[e].frames=b.frames.slice(0));for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.mixin.Call&&Array.prototype.splice.apply(d.rules,[e,1].concat(d.rules[e].eval(b)));for(var e=0,f;e<d.rules.length;e++)f=d.rules[e],f instanceof a.mixin.Definition||(d.rules[e]=f.eval?f.eval(b):f);return b.frames.shift(),d},match:function(a){return!a||a.length===0},variables:function(){return this._variables?this._variables:this._variables=this.rules.reduce(function(b,c){return c instanceof a.Rule&&c.variable===!0&&(b[c.name]=c),b},{})},variable:function(a){return this.variables()[a]},rulesets:function(){return this._rulesets?this._rulesets:this._rulesets=this.rules.filter(function(b){return b instanceof a.Ruleset||b instanceof a.mixin.Definition})},find:function(b,c){c=c||this;var d=[],e,f,g=b.toCSS();return g in this._lookups?this._lookups[g]:(this.rulesets().forEach(function(e){if(e!==c)for(var g=0;g<e.selectors.length;g++)if(f=b.match(e.selectors[g])){b.elements.length>e.selectors[g].elements.length?Array.prototype.push.apply(d,e.find(new a.Selector(b.elements.slice(1)),c)):d.push(e);break}}),this._lookups[g]=d)},toCSS:function(b,c){var d=[],e=[],f=[],g=[],h,i;this.root||(b.length===0?g=this.selectors.map(function(a){return[a]}):this.joinSelectors(g,b,this.selectors));for(var j=0;j<this.rules.length;j++)i=this.rules[j],i.rules||i instanceof a.Directive||i instanceof a.Media?f.push(i.toCSS(g,c)):i instanceof a.Comment?i.silent||(this.root?f.push(i.toCSS(c)):e.push(i.toCSS(c))):i.toCSS&&!i.variable?e.push(i.toCSS(c)):i.value&&!i.variable&&e.push(i.value.toString());return f=f.join(""),this.root?d.push(e.join(c.compress?"":"\n")):e.length>0&&(h=g.map(function(a){return a.map(function(a){return a.toCSS(c)}).join("").trim()}).join(c.compress?",":",\n"),d.push(h,(c.compress?"{":" {\n ")+e.join(c.compress?"":"\n ")+(c.compress?"}":"\n}\n"))),d.push(f),d.join("")+(c.compress?"\n":"")},joinSelectors:function(a,b,c){for(var d=0;d<c.length;d++)this.joinSelector(a,b,c[d])},joinSelector:function(b,c,d){var e=[],f=[],g=[],h=[],i=!1,j;for(var k=0;k<d.elements.length;k++)j=d.elements[k],j.combinator.value.charAt(0)==="&"&&(i=!0),i?h.push(j):g.push(j);i||(h=g,g=[]),g.length>0&&e.push(new a.Selector(g)),h.length>0&&f.push(new a.Selector(h));for(var l=0;l<c.length;l++)b.push(e.concat(c[l]).concat(f))}}}(c("../tree")),function(a){a.Selector=function(a){this.elements=a,this.elements[0].combinator.value===""&&(this.elements[0].combinator.value=" ")},a.Selector.prototype.match=function(a){var b=this.elements.length,c=a.elements.length,d=Math.min(b,c);if(b<c)return!1;for(var e=0;e<d;e++)if(this.elements[e].value!==a.elements[e].value)return!1;return!0},a.Selector.prototype.eval=function(b){return new a.Selector(this.elements.map(function(a){return a.eval(b)}))},a.Selector.prototype.toCSS=function(a){return this._css?this._css:this._css=this.elements.map(function(b){return typeof b=="string"?" "+b.trim():b.toCSS(a)}).join("")}}(c("../tree")),function(b){b.URL=function(b,c){b.data?this.attrs=b:(typeof a!="undefined"&&!/^(?:https?:\/\/|file:\/\/|data:|\/)/.test(b.value)&&c.length>0&&(b.value=c[0]+(b.value.charAt(0)==="/"?b.value.slice(1):b.value)),this.value=b,this.paths=c)},b.URL.prototype={toCSS:function(){return"url("+(this.attrs?"data:"+this.attrs.mime+this.attrs.charset+this.attrs.base64+this.attrs.data:this.value.toCSS())+")"},eval:function(a){return this.attrs?this:new b.URL(this.value.eval(a),this.paths)}}}(c("../tree")),function(a){a.Value=function(a){this.value=a,this.is="value"},a.Value.prototype={eval:function(b){return this.value.length===1?this.value[0].eval(b):new a.Value(this.value.map(function(a){return a.eval(b)}))},toCSS:function(a){return this.value.map(function(b){return b.toCSS(a)}).join(a.compress?",":", ")}}}(c("../tree")),function(a){a.Variable=function(a,b,c){this.name=a,this.index=b,this.file=c},a.Variable.prototype={eval:function(b){var c,d,e=this.name;e.indexOf("@@")==0&&(e="@"+(new a.Variable(e.slice(1))).eval(b).value);if(c=a.find(b.frames,function(a){if(d=a.variable(e))return d.value.eval(b)}))return c;throw{type:"Name",message:"variable "+e+" is undefined",filename:this.file,index:this.index}}}}(c("../tree")),function(a){a.find=function(a,b){for(var c=0,d;c<a.length;c++)if(d=b.call(a,a[c]))return d;return null},a.jsify=function(a){return Array.isArray(a.value)&&a.value.length>1?"["+a.value.map(function(a){return a.toCSS(!1)}).join(", ")+"]":a.toCSS(!1)}}(c("./tree"));var f=location.protocol==="file:"||location.protocol==="chrome:"||location.protocol==="chrome-extension:"||location.protocol==="resource:";d.env=d.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||location.hostname=="localhost"||location.port.length>0||f?"development":"production"),d.async=!1,d.poll=d.poll||(f?1e3:1500),d.watch=function(){return this.watchMode=!0},d.unwatch=function(){return this.watchMode=!1},d.env==="development"?(d.optimization=0,/!watch/.test(location.hash)&&d.watch(),d.watchTimer=setInterval(function(){d.watchMode&&m(function(a,b,c,d,e){b&&p(b.toCSS(),d,e.lastModified)})},d.poll)):d.optimization=3;var g;try{g=typeof a.localStorage=="undefined"?null:a.localStorage}catch(h){g=null}var i=document.getElementsByTagName("link"),j=/^text\/(x-)?less$/;d.sheets=[];for(var k=0;k<i.length;k++)(i[k].rel==="stylesheet/less"||i[k].rel.match(/stylesheet/)&&i[k].type.match(j))&&d.sheets.push(i[k]);d.refresh=function(a){var b,c;b=c=new Date,m(function(a,d,e,f,g){g.local?t("loading "+f.href+" from cache."):(t("parsed "+f.href+" successfully."),p(d.toCSS(),f,g.lastModified)),t("css for "+f.href+" generated in "+(new Date-c)+"ms"),g.remaining===0&&t("css generated in "+(new Date-b)+"ms"),c=new Date},a),l()},d.refreshStyles=l,d.refresh(d.env==="development")})(window);
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-02 07:55:30
|
Revision: 4546
http://oscss.svn.sourceforge.net/oscss/?rev=4546&view=rev
Author: oscim
Date: 2012-08-02 07:55:20 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
correction gabarit template BO
Correction liens listing product
ajout element less pour mise en forme du template oscss dans BO
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
Added Paths:
-----------
branches/2.1.1/catalog/admin/includes/template/oscss/element.less
branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab 2012-08-02 06:58:56 UTC (rev 4545)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminAccount/display_view.page.gab 2012-08-02 07:55:20 UTC (rev 4546)
@@ -23,7 +23,7 @@
<li><a href="#tabs-9"><?php echo __('tab account edit'); ?></a></li>
</ul>
-
+<div class="edit">
<div id="tabs-1" class="tabPage">
<div >
<?php
@@ -89,6 +89,8 @@
</div>
+<br class="clear" />
</div>
+</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-08-02 06:58:56 UTC (rev 4545)
+++ branches/2.1.1/catalog/admin/includes/gabarit/configuration/datatypeproduct.listing.gab 2012-08-02 07:55:20 UTC (rev 4546)
@@ -33,7 +33,7 @@
<div id="tabs-1" class="tabPage">
-
+<div class="edit">
<div class="tabs">
<ul>
<li><a href="#subtabs-1"><?php echo __('datatypeproduct tab configuration'); ?></a></li>
@@ -107,6 +107,8 @@
</div>
<?php endif; ?>
</div>
+<br class="clear" />
+</div>
</div>
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/products.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-02 06:58:56 UTC (rev 4545)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/products.php 2012-08-02 07:55:20 UTC (rev 4546)
@@ -1246,7 +1246,7 @@
foreach(self::$InitInfo['modele']['listing'] as $k=>$row){
if($k == 'action') $ord[$k]=self::ButtonRowsActions($item);
- elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="#" title="">'.$item['title'].'</a>';
+ elseif($k == 'title') $ord[$k]= '<a rel="'.tep_href_link('document.php', 'mod=img&typ=product&w=200&h=200&id='.$item['id']) .'" class="screenshot" href="#" title="" onclick="return false;">'.$item['title'].'</a>';
elseif($k == 'status') $ord[$k]=self::RowStatus($item);
// elseif($k == 'hidden') $ord[$k]=self::RowHidden($item);
elseif(in_array($k , array('added', 'modified' ,'available')) ) $ord[$k]=tep_date_short($item[$k]);
Added: branches/2.1.1/catalog/admin/includes/template/oscss/element.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/element.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/element.less 2012-08-02 07:55:20 UTC (rev 4546)
@@ -0,0 +1,136 @@
+/*---------------------------------------------------
+ * LESS Elements 0.6
+ * ---------------------------------------------------
+ * A set of useful LESS mixins by Dmitry Fadeyev
+ * Special thanks for mixin suggestions to:
+ * Kris Van Herzeele,
+ * Benoit Adam,
+ * Portenart Emile-Victor,
+ * Ryan Faerman
+ *
+ * More info at: http://lesselements.com
+ * -----------------------------------------------------*/
+
+.gradient(@color: #F5F5F5, @start: #EEE, @stop: #FFF) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, @start),
+ color-stop(1, @stop));
+ background: -ms-linear-gradient(bottom,
+ @start,
+ @stop);
+ background: -moz-linear-gradient(center bottom,
+ @start 0%,
+ @stop 100%);
+}
+.bw-gradient(@color: #F5F5F5, @start: 0, @stop: 255) {
+ background: @color;
+ background: -webkit-gradient(linear,
+ left bottom,
+ left top,
+ color-stop(0, rgb(@start,@start,@start)),
+ color-stop(1, rgb(@stop,@stop,@stop)));
+ background: -ms-linear-gradient(bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@start,@start,@start) 100%);
+ background: -moz-linear-gradient(center bottom,
+ rgb(@start,@start,@start) 0%,
+ rgb(@stop,@stop,@stop) 100%);
+}
+.bordered(@top-color: #EEE, @right-color: #EEE, @bottom-color: #EEE, @left-color: #EEE) {
+ border-top: solid 1px @top-color;
+ border-left: solid 1px @left-color;
+ border-right: solid 1px @right-color;
+ border-bottom: solid 1px @bottom-color;
+}
+.drop-shadow(@x-axis: 0, @y-axis: 1px, @blur: 2px, @alpha: 0.1) {
+ -webkit-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+ box-shadow: @x-axis @y-axis @blur rgba(0, 0, 0, @alpha);
+}
+.rounded(@radius: 2px) {
+ -webkit-border-radius: @radius;
+ -moz-border-radius: @radius;
+ border-radius: @radius;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.border-radius(@topright: 0, @bottomright: 0, @bottomleft: 0, @topleft: 0) {
+ -webkit-border-top-right-radius: @topright;
+ -webkit-border-bottom-right-radius: @bottomright;
+ -webkit-border-bottom-left-radius: @bottomleft;
+ -webkit-border-top-left-radius: @topleft;
+ -moz-border-radius-topright: @topright;
+ -moz-border-radius-bottomright: @bottomright;
+ -moz-border-radius-bottomleft: @bottomleft;
+ -moz-border-radius-topleft: @topleft;
+ border-top-right-radius: @topright;
+ border-bottom-right-radius: @bottomright;
+ border-bottom-left-radius: @bottomleft;
+ border-top-left-radius: @topleft;
+ -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box;
+}
+.opacity(@opacity: 0.5) {
+ -moz-opacity: @opacity;
+ -khtml-opacity: @opacity;
+ -webkit-opacity: @opacity;
+ opacity: @opacity;
+}
+.transition-duration(@duration: 0.2s) {
+ -moz-transition-duration: @duration;
+ -webkit-transition-duration: @duration;
+ transition-duration: @duration;
+}
+.rotation(@deg:5deg){
+ -webkit-transform: rotate(@deg);
+ -moz-transform: rotate(@deg);
+ transform: rotate(@deg);
+}
+.scale(@ratio:1.5){
+ -webkit-transform:scale(@ratio);
+ -moz-transform:scale(@ratio);
+ transform:scale(@ratio);
+}
+.transition(@duration:0.2s, @ease:ease-out) {
+ -webkit-transition: all @duration @ease;
+ -moz-transition: all @duration @ease;
+ transition: all @duration @ease;
+}
+.inner-shadow(@horizontal:0, @vertical:1px, @blur:2px, @alpha: 0.4) {
+ -webkit-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ -moz-box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+ box-shadow: inset @horizontal @vertical @blur rgba(0, 0, 0, @alpha);
+}
+.box-shadow(@arguments) {
+ -webkit-box-shadow: @arguments;
+ -moz-box-shadow: @arguments;
+ box-shadow: @arguments;
+}
+.columns(@colwidth: 250px, @colcount: 0, @colgap: 50px, @columnRuleColor: #EEE, @columnRuleStyle: solid, @columnRuleWidth: 1px) {
+ -moz-column-width: @colwidth;
+ -moz-column-count: @colcount;
+ -moz-column-gap: @colgap;
+ -moz-column-rule-color: @columnRuleColor;
+ -moz-column-rule-style: @columnRuleStyle;
+ -moz-column-rule-width: @columnRuleWidth;
+ -webkit-column-width: @colwidth;
+ -webkit-column-count: @colcount;
+ -webkit-column-gap: @colgap;
+ -webkit-column-rule-color: @columnRuleColor;
+ -webkit-column-rule-style: @columnRuleStyle;
+ -webkit-column-rule-width: @columnRuleWidth;
+ column-width: @colwidth;
+ column-count: @colcount;
+ column-gap: @colgap;
+ column-rule-color: @columnRuleColor;
+ column-rule-style: @columnRuleStyle;
+ column-rule-width: @columnRuleWidth;
+}
+.translate(@x:0, @y:0) {
+ -moz-transform: translate(@x, @y);
+ -webkit-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
Added: branches/2.1.1/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- branches/2.1.1/catalog/admin/includes/template/oscss/styles.less (rev 0)
+++ branches/2.1.1/catalog/admin/includes/template/oscss/styles.less 2012-08-02 07:55:20 UTC (rev 4546)
@@ -0,0 +1,1458 @@
+/**
+ * @ licence GPL *2005-2012 The osCSS developers - osCSS Open Source E-commerce
+ * @portion code Copyright (c) 2002 osCommerce
+ * @package osCSS-2 <www http://www.oscss.org>
+ * @version 2.1.1
+ * @date 01/01/2012, 18:17
+ * @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ * @encode UTF-8
+ */
+
+/* Definition */
+ @margin: 2%;
+ @lineheight: 16px;
+
+
+ @the-border: 1px;
+ @base-color: #111;
+ @red: #842210;
+
+ // tabs color text
+ @color_tab_text_default : #ffffff;
+ @color_tab_text_selected : #AE0405;
+ @color_tab_text_hover : #555555;
+
+ // color menu nav (gradient)
+ @color_menu_nav_cl_1 : #AE0405 ;
+ @color_menu_nav_cl_2 : #AE0405 ;
+ @color_menu_nav_cl_3 : #FD3841 ;
+
+
+ // color bouton classique (gradient)
+ @color_tabs_cl_1 : @color_menu_nav_cl_1 ;
+ @color_tabs_cl_2 : @color_menu_nav_cl_2 ;
+ @color_tabs_cl_3 : @color_menu_nav_cl_3 ;
+
+ // color bouton classique (gradient)
+ @color_bouton_cl_1 : @color_menu_nav_cl_1 ;
+ @color_bouton_cl_2 : @color_menu_nav_cl_2 ;
+ @color_bouton_cl_3 : @color_menu_nav_cl_3 ;
+
+ // color bouton and link submit , confirm , valid (gradient)
+ @color_bouton_submit_cl_1 : #248DBC ;
+ @color_bouton_submit_cl_2 : #248DBC ;
+ @color_bouton_submit_cl_3 : #B0F1F7 ;
+
+ // color bouton and link back, annulate, retrun (gradient)
+ @color_bouton_back_cl_1 : #000000 ;
+ @color_bouton_back_cl_2 : #000000 ;
+ @color_bouton_back_cl_3 : #5C5A5D ;
+
+ // widget
+ @color_widget_1 : #78222F; // title and th
+
+
+ @bg_hover : #E6FF99; // hover row or filter
+ @bg_hover_txt : #000000; // hover row or filter
+
+
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : #D7D7D7;
+ @color_sorting : #84509A; // cols sorting
+ @color_sorting_text : #A7A7A7;
+
+ @datatable_color_txt :#000000 ; // couleur text dans les tableau
+
+ @color_split : #78222F;
+ @color_split_active : #78222F;
+ @color_split_active_text : white;
+
+/* Mixin */
+
+ @import "element.less";
+
+ .wrap () {
+ text-wrap: wrap;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ word-wrap: break-word;
+ }
+
+ /**
+ * Reto-compatibilte oscommerce oscss < 2.xx
+ */
+ /* info box block droit */
+ .infoBoxHeading {
+ background-color: #ffffff;
+ border-width:0;
+ .rounded(5px);
+ }
+ .infoBoxContent{
+ border-width: 0px 1px 0px 1px;
+ border-color: #E6E6E6;
+ border-style: solid;
+ padding: 2px 2px 5px 10px;
+ font-size: 10px;
+ color: #000;
+ background-color: #f1f1f1;
+ list-style:none;
+ line-height:1.7em;
+ .rounded(5px);
+ }
+ .infoBoxContent li{clear:both; }
+
+
+
+
+
+
+
+
+ /* Generalite */
+
+
+ * {margin:0;padding:0}
+ a :link,
+ a:visited {text-decoration: underline; color:#000;}
+ a:hover { text-decoration: none; }
+ img { border-width:0 ; margin:0; padding:0; }
+ h1 { font-size: 2em ; padding:1em; }g37
+ h1 img {border-width:0 ; margin:0; padding:0;}
+ h2 { font-size: 1.2em ;text-shadow:0 1px 0 #fff;}
+ h3 {
+ clear:both;
+ color: #78222F;
+ font-size: 20px;
+ font-weight: bold;
+ padding: 5px 0 5px 10px;
+ text-shadow: 0 1px 1px #444444;
+ }
+ h4 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+ h5 { font-size: 1em ;text-shadow:0 1px 0 #fff;}
+ p {padding:1em;}
+ ul {list-style:none;}
+ th { margin:2px 1px; text-align: left; padding: 0 5px;line-height:30px;}
+
+
+
+ /* general class */
+ .error{ color:red; }
+ .info{ color:blue;}
+ div.info{ color:black;padding:10px 2px; border:2px solid #3A3B35; -moz-border-radius:6px; -webkit-border-radius:6px; background:#73756A;}
+ .alert{ color:#ae0405; }
+ .fright{ float:right; }
+ .fleft {float:left; }
+ .tleft{text-align:left}
+ .tright{text-align:right}
+ .tcenter{text-align:center}
+ .inline ,
+ .inline *,
+ div#central .inline *{ display:inline-block; }
+ .nobr {white-space:nowrap;}
+
+ .w_100 {width:99%;}
+ .w_90 {width:89%;}
+ .w_80 {width:79%;}
+ .w_70 {width:69%;}
+ .w_60 {width:59%;}
+ .w_50 {width:49%;}
+ .w_40 {width:39%;}
+ .w_30 {width:29%;}
+ .padd_w {padding-left:10px; padding-right:10px;}
+ .padd_h {padding-top:10px; padding-bottom:10px;}
+ .linkdoc {font-size:11px; font-weight:bold; color:blue; }
+ .spacer {clear:both;}
+ .fieldRequired { color: #ff0000; }
+ .smallText { font-size: 0.8em; }
+ .errorText { color: #ff0000; }
+
+
+ /* --- message box --- */
+ .messageBox { font-family: Verdana, Arial, sans-serif; font-size: 10px; padding:0;}
+ .messageStack{ font-family: Verdana, Arial, sans-serif;}
+ .messageStack li{padding:2px 0;}
+ .messageStackError,
+ .messageStackWarning { background:#fbe3e1;}
+ .messageStackSuccess { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x; }
+ .messageStackNotice { background:transparent url(img/1/menu_bg_success.jpg) left top repeat-x;}
+
+ /* toogle item complet js action */
+ h4.Ctrtirroir,
+ h5.Ctrtirroir{ margin: 10px 0; padding: 0 0 0 20px; font-size: 14px; }
+ .Ctrtirroir {
+ background:transparent url('../../../images/icons/icon_down.gif') left top no-repeat;
+ padding-left:20px;
+ height:16px;
+ }
+ .Ctrtirroir.closed {background:transparent url('../../../images/icons/icon_arrow_right.gif') left top no-repeat; }
+ fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
+
+
+
+
+
+
+
+
+
+
+
+body {
+ background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background-attachment:fixed;
+// color:#000;
+ margin:0;
+ padding:0;
+ font: normal 11px Verdana, Arial, sans-serif;
+}
+
+
+/**
+ * Nav Bar , master menu
+ * */
+nav {
+ background:transparent ;
+ height:(@lineheight * 1.55);
+ border-top: 1px solid #fff;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ }
+
+ a {
+ display:block;
+ color:white;
+ text-decoration:none;
+ height:(@lineheight * 1.1);
+ text-align:center;
+ font:normal 11px Verdana, Arial, sans-serif;
+
+ &:link,
+ &:visited {
+ color:white;
+ }
+
+ &:hover {
+ color:#000;
+ text-decoration:none;
+ }
+ }
+
+ .disabled{
+ display:none;
+
+ &:hover { display:none;}
+ }
+
+ .ssmenu a {
+ color:#9C9A9B;
+ text-shadow: none;
+ padding:2px 0px 2px 26px;
+ text-decoration:none;
+ line-height:(@lineheight * 1.1);
+ border:none;
+// width:154px;
+ text-align:left;
+// white-space:nowrap;
+
+ &:hover {
+ background-color:#999;
+ color:#fff;
+ text-shadow: 0 1px 0 #000;
+ text-decoration:none;
+ }
+ }
+
+ ul{
+ list-style:none;
+
+ .ssmenu {
+ margin:0 1px 1px 0;
+ background:#ccc;
+ border-left:1px solid #747474;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ .ssmenu{
+ position:absolute;
+ top:-1px;
+ left:180px;
+ display:none;
+ z-index:15;
+
+ .sub{
+ &:after{ content: " >>"; }
+ }
+ }
+ }
+
+ li{
+ position:relative;
+ float:left;
+ padding: 0 5px;
+ height:(@lineheight * 1.55);
+
+ &:hover ul { display:block; }
+
+ ul{
+ position:absolute;
+ top:(@lineheight * 1.55);
+ left:0;
+ display:none;
+ z-index:10;
+
+ li{
+ float:none;
+ width:200px;
+ background:#303030 ;
+// z-index:15;
+
+// ul{
+// z-index:20;
+//
+// li{
+// z-index:25;
+// }
+// }
+ }
+ }
+ }
+
+ .ssmenu li:hover ul.ssmenu,
+ .ssmenu li ul.ssmenu li:hover ul.ssmenu{ display:block }
+ }
+
+ ul.fleft{
+ .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
+
+ a{
+ padding-top:4px;
+ padding-left: 20px;
+ }
+ }
+
+
+ /* Switcher */
+ p.themeSwitcher {
+ float:right;
+ margin:0;
+ padding:0 1em 0 0;
+ text-align:right;
+ color:white;
+
+ select {
+ margin:2px;
+ padding:0;
+ vertical-align:middle;
+ width:100px;
+ background-image: none;
+ border:1px solid #D7D7D7;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 200, 255) ;
+
+
+ option{ color:white;font-size:0.9em; }
+ }
+ }
+
+
+}
+
+/* user bar */
+div#user {
+ background:#303030 ;
+ border-top: 1px solid #3F3F3F;
+ padding-right:10px;
+ height:27px;
+
+ ul#MenuExts{
+
+ li{
+ position:relative;
+ float:left;
+ background: none repeat-x scroll 0 0 #78222F;
+ height: 25px;
+ padding: 0 8px;
+
+ a {
+ display:block;
+ padding-top:4px; color:#000;
+ text-decoration:none;
+ text-shadow:none;
+ height:18px;
+ text-align:center;
+ font:normal 11px Verdana, Arial, sans-serif;
+ color:white;
+
+ &:hover{
+ color:gray;
+ }
+ }
+ }
+ }
+}
+
+
+
+/**
+ * Structure base html
+ * no specific forms (cf section forms )
+ */
+
+ .configuration{
+ div#central{
+
+ div#ssmenu{
+ display: block;
+ height: 20px;
+ line-height: 20px;
+ padding: 5px 10px;
+ width: 100%;
+ }
+
+ div.box_right {
+ right:0;
+ width:39%;
+
+ ul{ list-style:none; }
+ }
+ }
+ }
+
+// .page {
+ // div#central{
+ // }
+ // }
+
+ div#glob {
+ width:100%;
+ z-index:10;
+ height:100%;
+
+ header#header {
+ background:black;
+ min-width:900px;
+ width:90%;
+ margin:0 0;
+ position:fixed;
+ z-index:10;
+
+ div#headInfos {
+ display:inline-block;
+ height:25px;
+ margin:0;
+ padding:0;
+ width:100%;
+ color:white;
+
+ h1 {display:inline; margin:0 2px; padding:0; line-height:25px;}
+ h2 {display:inline; line-height:25px; color:white; vertical-align:top;}
+
+ a,
+ span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
+
+ a:hover{text-decoration:underline;}
+ }
+ }
+
+ div#central{
+ position:relative;
+ padding:10px 5px;
+ top:79px;
+ margin-bottom: 79px;
+ border-left: 1px solid black;
+ border-right: 1px solid black;
+ border-bottom: 1px solid black;
+ background:white;
+
+ div.box_uniq {
+ width:100%;
+ float:left;
+ padding: 0;
+ background:none;
+ }
+
+ div.box_left { width:60%; float:left; }
+
+ div.box_right {
+ width:39%;
+ float:right;
+// background:#f1f1f1;
+// background-color: #ffffff;
+ }
+
+ h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
+ }
+
+ }
+
+ div#center,
+ div#bas {
+ margin: 0 auto;
+ position: relative;
+ min-width:900px;
+ width:90%;
+ }
+
+ div#bas {
+// margin-top:8em;
+ clear:both;
+ height:25px;
+ background:#303030;
+ color:white;
+
+ a,
+ a:link,
+ a:visited {
+ text-shadow : none;
+ padding: 4px 25px;
+ color:white;
+ }
+
+ // logo link partenaires
+ .oscommerce { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+ .oscss { background: transparent url(img/1/oscss.png) 0px 2px no-repeat; text-decoration:none; }
+ .oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
+ }
+ footer {
+ background: #505050;
+ clear:both;width:100%;
+ text-align:center;
+ color:white;
+
+ a,
+ a:link,
+ a:visited {
+ color:white;
+ text-decoration: none;
+
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+
+
+
+
+/**
+ * Bouton
+ */
+ .button,
+ select.button,
+ input[type=submit].button,
+ input[type=button].button,
+ button.button,
+ a.button{
+ display: inline-block;
+ font-family:Arial;
+ white-space:nowrap;
+ float:right;
+ color:white;
+ vertical-align:middle;
+ border:1px solid #fff;
+ height: 25px;
+ line-height: 25px;
+ margin:8px 20px;
+ text-shadow: none;
+
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+ input[type=image].button {
+ float:left;
+ height:18px;
+ width:18px;
+ }
+
+ input.button,
+ button.button{font-size:11px; background:#ccc;padding:2px 5px; }
+
+
+ a.button{ padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
+ a.button:hover{color:white;text-decoration:none; }
+
+ a.button,
+ select.button,
+ input.button,
+ button.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_2, @color_bouton_cl_3) ;
+ }
+
+ a.button.ActionYes,
+ input.button.ActionYes,
+ input[type=image].button.ActionYes,
+ input[type=submit].button.ActionYes,
+ button.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_2, @color_bouton_submit_cl_3) ;
+ }
+
+ a.button.ActionBack,
+ input[type=image].button.ActionBack,
+ button.button.ActionBack {
+ color:white;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+
+ input:hover.button,
+ button:hover.button{background:#797979;color:white;}
+
+ a:hover.button,
+ input:hover.button,
+ button:hover.button {
+ .gradient( @color_bouton_cl_1, @color_bouton_cl_3, @color_bouton_cl_2) ;
+ opacity:0.6;
+ }
+
+ a:hover.button.ActionYes,
+ input:hover.button.ActionYes,
+ button:hover.button.ActionYes {
+ .gradient( @color_bouton_submit_cl_1, @color_bouton_submit_cl_3, @color_bouton_submit_cl_2) ;
+ color:black;
+ }
+
+ a.button.ActionBack,
+ input.button.ActionBack,
+ button.button.ActionBack {
+ color:white;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_2, @color_bouton_back_cl_3) ;
+ }
+
+ a:hover.button.ActionBack,
+ input:hover.button.ActionBack,
+ button:hover.button.ActionBack {
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
+
+ input[type=image].button,
+ a.buttonimg img{ opacity:1;}
+
+ input[type=image]:hover.button ,
+ a:hover.buttonimg img,
+ a.buttonimg img:hover{ opacity:0.6;}
+
+ /* Spe buttons broswer img */
+ a.button.browser {height:24px;}
+ a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
+ .row_action a.button {margin:0;}
+
+
+ /* Block html content all bouton */
+ .button_nav{
+ clear:both;
+
+ form{
+ float:right;
+ width:100px;
+
+ p {margin:0;padding:0;}
+ }
+ }
+
+
+/**
+ * Section for block widget in dashbord
+ */
+.widget{
+ float: left;
+ margin: @margin;
+ width: (100% - (@margin * 1) );
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 255, 200) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ h3 {
+ color: @color_widget_1;
+ clear: both;
+ margin-bottom:@margin;
+ padding:5px 0 5px 5px;
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 255, 200) ;
+
+ a{
+ color: @color_widget_1;
+ text-decoration:none;
+
+ &:hover{
+ color: gray;
+ }
+ }
+ }
+
+ ol {padding-left:25px;}
+
+ .dataTableBase tr{
+ background-color: #F0F0F0;
+
+ th {
+ height: 20px;
+ line-height: 20px;
+ background : @color_widget_1;
+ }
+
+ &:nth-child(odd) {
+ background-color: #D7D7D7;
+ }
+
+ a{
+ font-weight : bold;
+ color: @color_widget_1;
+ }
+ }
+
+
+ /* sous menu en widget , specifique page conf et dashboard configuration */
+ div#ssmenu{
+ a {
+ background: none repeat scroll 0 0 #797979;
+ border-right: 1px solid #444444;
+ clear: both;
+ color: white;
+ font-size: 10px;
+ margin: 0 0 1px 25px;
+ padding: 5px 10px;
+ text-shadow: 0 1px 0 #000000;
+ width: 40%;
+
+ &:hover {
+ float:left;
+ margin:0;
+ background:#eee;
+ color:#000;
+ text-shadow: 0 1px 0 #fff;
+ }
+ }
+ }
+}
+
+
+.edit{
+ background:#eee;
+ background-attachment:none;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 190, 240) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+}
+
+
+/**
+ * Dipslay all listing in array
+ */
+ .dataTableBase,
+ .dataTableSearch,
+ .dataTable{
+ width:100%;
+ border-width:0;
+ border:1px solid #ACAAAC;
+ .rounded(5px);
+
+ a.button,
+ input[type=submit].button,
+ input[type=image].button,
+ button.button {
+ margin:0;
+ }
+
+
+ tr {
+ border-top-color: #FFFFFF;
+ border-bottom-color: #525552;
+ border-left-color: #FFFFFF;
+ border-right-color: #525552;
+ border-style: solid;
+ border-width: 1px;
+ padding:0;
+ margin:0;
+
+ th{
+ background-color: @color_widget_1;
+ font-size:1em;
+ font-weight:bold;
+ text-align:center;
+ color:white;
+ text-shadow:none;
+ }
+ }
+
+
+ tbody{
+ background-color: #f1f1f1;
+
+ tr{
+ border:none;
+ cursor:default;
+
+ &:hover{
+ background-color: @bg_hover;
+ cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
+ }
+
+ td{
+ line-height:12px;
+ color: @datatable_color_txt;
+ padding: 2px;
+ font-size: 10px;
+ cursor:default;
+
+ a{
+ text-decoration:none;
+ color: @datatable_color_txt;
+ }
+
+ /* Replace value by icon */
+ .edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
+
+ .edit-input-value .Flag-0.txt,
+ .edit-input-value .Val-0.txt { display:none}
+ .edit-input-value .Flag-0.img{background:transparent url("../../../images/icons/icon_status_red.gif") left top no-repeat}
+ .edit-input-value .Val-0.img { width: 10px; background:transparent url("../../../images/icons/icon_view_red.gif") left top no-repeat}
+
+ .edit-input-value .Flag-1.txt,
+ .edit-input-value .Val-1.txt { display:none}
+ .edit-input-value .Flag-1.img{background:transparent url("../../../images/icons/icon_status_green.gif") left top no-repeat}
+ .edit-input-value .Val-1.img {width: 10px; background:transparent url("../../../images/icons/icon_view_green.gif") left top no-repeat}
+ }
+ .row_action {
+ min-width:100px;
+ text-align:right;
+ }
+
+ .row_action_large {
+ min-width:250px;
+ text-align:right;
+ }
+
+ .row_customers {
+ min-width:100px;
+ text-align:left;
+ }
+
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
+ }
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
+ }
+
+ .sorting_2{
+ background-color:( @color_sorting + 65);
+ }
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 65);
+ }
+
+ .sorting_3{
+ background-color:( @color_sorting + 80);
+ }
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 80);
+ }
+
+
+ }
+
+ .odd{
+ background-color: @bg_table_tr_odd;
+ }
+
+ .even{
+ background-color: @bg_table_tr_even;
+ }
+ }
+
+ tfoot tr td input {width:80%;text-align:left;}
+ }
+
+
+ .dataTables_wrapper {
+ min-height:200px;
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .paging_full_numbers{
+
+ .paginate_button,
+ .paginate_active{
+ .rounded(5px);
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ .paginate_active{
+ color : @color_split_active_text;
+ background-color: @color_split_active;
+ }
+ }
+
+ .top{
+ padding: 1px 10px;
+ .border-radius( 5px,0, 0, 5px);
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ margin-bottom: 5px;
+ }
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+ }
+
+ .bottom {
+ padding: 5px 10px;
+ .border-radius( 0, 5px, 5px, 0);
+
+ .TableTools {
+ margin: 0 0 5px 0;
+ padding:0;
+ height:34px;
+ }
+
+ .dataTables_length {
+ float: left;
+ width: 40%;
+ }
+
+ .dataTables_paginate {
+ float: right;
+ text-align: right;
+ padding-top: 0px;
+ }
+
+ }
+ }
+
+ /**
+ * class qui rend element enfant visible au survol de l'element parent
+ */
+ .view.fils {display:none}
+ .dataTableBase tr:hover .view.fils,
+ .dataTable tr:hover .view.fils,
+ .dataTableRow.Selected .view.fils,
+ .view.parent:hover .view.fils{display:block;height:13px}
+
+
+
+
+ /**
+ * Listing Filter for Datatable
+ */
+ div#central form#filters {
+ padding:0;
+ margin: 0 1em;
+ width:98%;
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ .border-radius( 5px, 5px, 5px, 5px);
+ .rounded(5px);
+
+ p.Ctrtirroir {
+ padding: 2px 10px 2px 20px;
+ font-size:1.2;
+ width:95.2%;
+
+// border-color: #CCCCCC #CCCCCC -moz-use-text-color;
+// border-style: solid solid none;
+// border-width: 1px 1px medium;
+ color: black;
+ font-weight: bold;
+
+ &:hover {
+ background-color: @bg_hover;
+ cursor:pointer;
+ }
+ }
+
+ div#filtre {
+ padding:0;
+ border:1px solid #AAAAAA;
+ background: transparent;
+
+ ul.ui-tabs-nav {
+ width:99.6%;
+
+ li{
+ line-height:1em;
+ width:auto;
+ }
+ }
+ }
+
+ fieldset label{width:auto;}
+
+ li.select{
+ color : @color_tab_text_selected ;
+ }
+ }
+
+
+
+/**
+ * Forms
+ */
+ fieldset {
+ margin: 0.3em ;
+ padding:0.3em;
+ border:none;
+
+ p {
+ margin: 0.3em;
+ padding:0.3em;
+ }
+
+ select,
+ input[type="text"] { min-width:62%; display:inline-block;}
+
+ select option {display:block; float:none;clear:both;width:100%}
+
+ label { width: 60%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: right; padding: 0 0 2px 0;}
+
+ ul{
+ list-style:none;
+ .rounded(5px);
+ }
+ // Cat list lors edition article ou cms
+ ul.LinkToView{
+ overflow: auto;
+ max-height: 160px;
+ background-color: #fff;
+ padding: 5px;
+ line-height: 15px;
+ border: 1px solid #666;
+ }
+ }
+
+ input.radioInput {width:30px;}
+
+ div#form_bt { width: 80%; margin: 1em 2em;}
+ ul.form_radio_inline{display:inline-block;}
+ .noselected{}
+ .selected{background:#f0d4bf;}
+ .color_type {display: inline-block; padding: 6px 0;background: none repeat scroll 0 0 transparent; width: 100% !important;}
+
+
+ // master central display
+ div#central form{
+ padding:0.5em 1em;
+
+ label { display: inline-block; font-weight: bold; line-height: 18px; margin: 5px 5px 5px 0; padding: 0 0 2px; text-align: left; min-width: 20%;}
+
+ fieldset legend { color:#666666; font-size:1.2em; font-style:italic; font-weight:bold; padding:0 5px 0 20px;}
+
+ textarea{ vertical-align:baseline;}
+
+ p{
+
+
+// input[type="radio"],
+ input[type="checkbox"] { float:right; }
+
+ select,
+ input[type="text"] {
+ color: black;
+ margin:5px 15px;
+ min-width:200px;
+ border:1px solid #D7D7D7;
+ .border-radius(5px,5px,5px,5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ }
+ select{
+ padding:1px 0 0 0;
+ height:20px;
+ line-height:20px;
+ }
+ }
+ p.new_product_img {
+ float:left;
+ padding:5px;
+ margin : 0 auto;
+ text-align:center;
+ width:98%;
+ border:1px solid #ACAAAC;
+ .border-radius(5px,5px,5px,5px);
+
+ img{
+ margin:auto;
+ max-width: 300px;
+ }
+ }
+
+
+ ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
+
+ .block_form {
+ .block_input{
+ text-shadow:0 1px 0 #fff;
+ width:94.9%;
+ margin:2px 1px;
+ display:inline-block;
+ text-align: left;
+ background:#C9C9C9;
+ float:left;
+ line-height:18px;
+ padding:5px 5px 10px 5px;
+ border:1px solid #D7D7D7;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 200, 255) ;
+
+
+ span.value_edit {clear:both;display:inline-block; width:100%;}
+
+ br,
+ span.value_edit br{display:none;}
+
+ label br {display:inline-block;}
+
+ span.edit-input,
+ span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
+
+ span.edit-input{
+ white-space:nowrap;
+
+ input{float: left;}
+
+ .edit-input-value-alternate {display:inline-block;width:20px; height: 20px;margin: 0 12px;}
+ .edit-input-value {padding-left:12px;}
+ /* remplacement true /false par icone */
+ .edit-input-value.Val-true ,
+ .edit-input-value.Val-false {font-size:0;}
+ .edit-input-value-alternate.Val-true {background:transparent url(img/1/check.png) left top no-repeat; }
+ .edit-input-value-alternate.Val-false {background:transparent url(img/1/busy.png) left top no-repeat;}
+ }
+ }
+
+ .block_input.tirroir {float:none;}
+
+ .tabs_lang{width:98.5%; float:left;}
+ }
+
+ .block_field {
+ text-shadow:0 1px 0 #fff;
+ width:98.9%; margin:2px ;
+ display:inline-block;
+ text-align: left;
+ padding: 5px;
+ float:left;
+// background:#eee;
+// .border-radius(5px);
+// .rounded(5px);
+// .bw-gradient( #E4E4E4, 200, 255) ;
+// .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ .tabs,
+ .tabs_lang{
+ width:96.5%;
+ margin:0 2px ;
+ display:inline-block;
+ text-align: left;
+ padding:0 5px;
+ float:left;
+ background:#eee;
+ }
+
+ .tabs_lang ul.ui-tabs-nav,
+ .tabs_lang ul.ui-tabs-panel{display: inline-block; margin: 0 -5px; padding: 1px; width: 100%;}
+ }
+
+ .block_input label.inline { white-space:nowrap; width: 20%;}
+
+ .edit.col_right .block_input{
+ width:95%;
+
+ label{width:20%;text-align:left;font-weight:bold}
+ }
+
+ .block_input .hasDatepicker{ margin:0; display:inline-block; text-align: left; padding: 0 5px; background:#DEDADE;float:left;line-height:30px; min-width:0;}
+
+ .input-multi input[type="checkbox"],
+ .input-multi input[type="radio"]{float:none;}
+
+
+ }
+
+ div#central form#configuration p input[type="text"] { margin:5px 15px;width:60%; }
+
+ /* Select Categorie */
+ div#central #CurrentPathSelect *,
+ div#central #CurrentPathSelect form {
+ margin:@margin 0;
+ padding:0;
+ width:100%;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+
+ select#cPath {
+ margin:0;
+ font-size:18px;
+ color:black;
+ font-weight:bold;
+ padding:0.2em 0.6em;
+
+ &:hover {background-color: @bg_hover;cursor:pointer; }
+
+ option {
+ margin:0;
+ background-color:#f5f5f5;
+ }
+ }
+ }
+
+
+ /**
+ * Section specific Orders page
+ */
+ div.main-orders.block {
+ width: 46%;
+ margin:@margin (@margin / 2);
+ background:#c9c9c9;
+ .border-radius(5px,5px,5px,5px);
+ .box-shadow(2px 5px 3px rgba(0,0,0,0.5));
+ }
+
+ div#central table.main-orders {
+ width:100%;
+
+
+ thead tr th{background:#303030; color:white;font-weight: normal; text-shadow: none;}
+
+ tr th{margin:0; background:#eee; height:20px;line-height: 20px; }
+ }
+ div#central .box_uniq.block_form.main-orders fieldset{margin:10px 0 0 0;padding:0 5px;}
+ div#central .block_form.main-orders .block_input br,
+ div#central .block_form.main-orders .block_input span.value_edit br{display:block;height:0;}
+
+ /* Ajsutement customer page */
+ div#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
+
+
+ /**
+ * External - plugin - others
+ */
+ // UI
+ /* Layout helpers */
+ .ui-helper-hidden { display: none; }
+ .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+ .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+ .ui-helper-clearfix {
+ zoom: 1;
+
+ &:before,
+ &:after { content: ""; display: table; }
+ &:after { clear: both; }
+ }
+ .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+ /* Interaction states */
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ font-weight: normal;
+ color: @color_tab_text_default;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_2, @color_tabs_cl_3) ;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_default;
+ text-decoration: none;
+ }
+ }
+
+ .ui-state-hover,
+ .ui-widget-content .ui-state-hover,
+ .ui-widget-header .ui-state-hover,
+ .ui-state-focus,
+ .ui-widget-content .ui-state-focus,
+ .ui-widget-header .ui-state-focus {
+// background: #dadada url(img/1/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+ .gradient( @color_tabs_cl_1, @color_tabs_cl_3, @color_tabs_cl_2) ;
+ font-weight: normal;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_hover;
+ text-decoration: none;
+ }
+ }
+
+ .ui-state-hover a,
+ .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: 1px solid #aaaaaa;
+ background: #ffffff url(img/1/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+ font-weight: normal;
+ color: @color_tab_text_selected;
+
+ a,
+ a:link,
+ a:visited {
+ color: @color_tab_text_selected;
+ text-decoration: none;
+ }
+ }
+
+
+ .ui-widget :active { outline: none; }
+
+ // UI generic
+ .ui-widget {
+ font-family: Verdana,Arial,sans-serif;
+ font-size: 1.1em;
+
+ .ui-widget { font-size: 1em; }
+
+ input,
+ select,
+ textarea,
+ button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+ }
+
+ .ui-widget-content {
+// background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+ color: #222222;
+ }
+
+ .ui-widget-header {
+ border-radius: 0;
+ border-bottom: 1px solid #aaaaaa;
+ color: #222222;
+ font-weight: bold;
+
+ a { color: #222222; }
+ }
+
+
+
+ // UI tabs
+ .ui-tabs {
+ position: relative;
+ padding: .2em;
+ zoom: 1;
+
+ .ui-tabs-nav {
+ margin: 0;
+ padding: 0;
+
+ li {
+ list-style: none;
+ float: left;
+ position: relative;
+ top: 1px;
+ margin: 0 .1em 0 0;
+ border-bottom: 0 !important;
+ padding: 0;
+ white-space: nowrap;
+
+ a {
+ float: left;
+ padding: .3em 0.5em;
+ text-decoration: none;
+ cursor: pointer;
+ }
+
+ .ui-tabs-selected {
+ margin-bottom: 0;
+ padding-bottom: 1px;
+ }
+ .ui-tabs-selected a
+ .ui-tabs-selected a,
+ .ui-state-disabled a,
+ .ui-state-processing a { cursor: text; }
+ }
+ }
+
+ .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; }
+
+ .ui-tabs-panel { display: block; border-width: 0; padding: 0.3em 0.3m; background: none; }
+
+ .ui-tabs-hide { display: none !important; }
+
+ div.box_uniq { width:99%; }
+ }
+
+
+
+ /* popup form by fancy . complet independant external css file specific for fancy in /javascript/jquery.fancy */
+ div#fancybox-inner{
+ h3 { background: none repeat scroll 0 0 black; color: white; font-weight: normal; height: 21px; left: 0; line-height: 20px; padding: 0; position: absolute; text-align: center; text-shadow: none; top: 0; width: 100%;}
+
+ form {
+ float:left;
+ position: relative;
+ top:20px;
+ padding: 0 0 30px;
+ margin:0 0 30px 0;
+
+ h3{ top: -25px;}
+
+ fieldset {
+ margin: 5px;
+ padding:5pxem;
+ border:none;
+
+ label { width: 100%; line-height: 18px; margin-right: 10px; display:inline-block; text-align: left; padding: 0 0 2px 0;}
+
+ select,
+ input[type="text"] { min-width:65%; display:inline-block;float:right;}
+
+ .button_nav {bottom: 0; position: absolute; right: 0 ; height:25px;}
+ }
+ }
+ }
+
+
+
+ // Toolips
+ .tooltip{
+ position:absolute;
+ z-index:999;
+ left:-9999px;
+ background-color:#dedede;
+ padding:5px;
+ border:1px solid #fff;
+ width:250px;
+
+ p{
+ margin:0;
+ padding:0;
+ color:#fff;
+ background-color:#222;
+ padding:2px 7px;
+ }
+ }
+
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
