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-02 06:59:06
|
Revision: 4545
http://oscss.svn.sourceforge.net/oscss/?rev=4545&view=rev
Author: oscim
Date: 2012-08-02 06:58:56 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Report correction et amelioration du backoffice
correction diverse coquille et reliquat
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/aca.php
branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
branches/2.1.1/catalog/admin/includes/classes/menu.php
branches/2.1.1/catalog/admin/includes/content/configuration.central.inc
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.clause.gab
branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
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/featureds.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php
branches/2.1.1/catalog/admin/includes/modules/pages/cms_content.php
branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php
branches/2.1.1/catalog/admin/includes/modules/pages/navigation_links.php
branches/2.1.1/catalog/admin/includes/modules/pages/products.php
branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php
branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php
branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php
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/jquery-ui-1.css
branches/2.1.1/catalog/admin/includes/template/oscss/stylesheet-1.css
branches/2.1.1/catalog/admin/includes/widget/CustomerLast.php
branches/2.1.1/catalog/admin/includes/widget/orderLast.php
branches/2.1.1/catalog/includes/classes/split_page_results.php
branches/2.1.1/catalog/includes/triggers/search_suggest.inc
branches/2.1.1/catalog/install/includes/language/en_EN/install.base.txt
branches/2.1.1/catalog/install/includes/language/fr_FR/install.base.txt
branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_full_tag.sql
branches/2.1.1/catalog/redirect.php
branches/2.1.1/catalog/templates/defaut/includes/content/contact_us.php
Modified: branches/2.1.1/catalog/admin/includes/classes/aca.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/aca.php 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/classes/aca.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -159,7 +159,7 @@
$r=array();
foreach ($this->modules as $key=>$module) {
if (method_exists($module, $method )) /// control presence method
- $r[$key]=$this->modules[$key]->$method($attrs[0]);
+ $r[$key]=$this->modules[$key]->$method($attrs);
}
return $r;
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-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -81,7 +81,7 @@
public function __call($method, $attrs) {
$r=array();
foreach ($this->modules as $key=>$module) {
- if (( isset($attrs['flag']) && isset($module->$attrs['flag']) && (bool)$module->$attrs['flag']) /// control flag
+ 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);
@@ -98,7 +98,7 @@
*/
private function control_type_mod($flag){
$this->load_type_product();
- if(in_array( $this->type_flag ,explode(',',$flag) ) || $flag==0) return true;
+ if(in_array($flag,explode(',',$this->type_flag) ) || $flag==0) return true;
else return false;
}
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -118,15 +118,17 @@
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content());
+
if(count($sql_data_array) > 0 )
tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
+
// no touch if just update one rows
if(count($sql_data_array) >= 3 ) {
- /**
- TODO Couplage avec MLinkto + datatype actif
- */
+ /**
+ TODO Couplage avec MLinkto + datatype actif
+ */
if(DataTypes::is_active('categorie')) {
/// Clean link posts to categorie and save new link
if(isset($option['cPath']) && count($post['categories']) == 0)
@@ -154,11 +156,12 @@
}
}
+
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
$sql_data_array = array();
$language_id = $list_languages[$i]['id'];
- if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]);
+ if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]) ;
if(isset($post['content_title'][$language_id])) $sql_data_array['content_title'] =tep_db_prepare_input($post['content_title'][$language_id]);
Modified: branches/2.1.1/catalog/admin/includes/classes/fileUtility.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/fileUtility.php 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/classes/fileUtility.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -28,7 +28,7 @@
}
/**
- @brief block process in other class if result in loop process content error
+ @brief block process in other class if result in loop process content error
@param bool true, block messageSatck
*/
public static function CfgComport($value){
@@ -119,7 +119,7 @@
@fn _unlink($source)
@brief recusrive delete folder and files
@param $source absolute path
- @return boolean false for error
+ @return boolean false for error
*/
public static function _unlink($source){
if (file_exists($source) && is_writeable($source))
@@ -133,7 +133,7 @@
@fn _mkdir($path)
@brief recusrive create folder
@param $path absolute path
- @return boolean false for error
+ @return boolean false for error
*/
public static function _mkdir($path) {
@@ -177,8 +177,8 @@
/**
@fn _chmod($path, $mod=0777)
@brief chmod
- @param $path absolute path
- @param $mod
+ @param $path absolute path
+ @param $mod
@return boolean true for ok or false
*/
public static function _chmod($path, $mod=0777) {
@@ -186,11 +186,11 @@
if (is_dir($path) && $path!='/') {
self::_chmod(dirname($path));
- if(!@chmod($path, (int)$mod))
+ if(!@chmod($path, (int)$mod))
return false;
}
elseif(file_exists($path) && $path!='/') {
- if(!@chmod($path, (int)$mod))
+ if(!@chmod($path, (int)$mod))
return false;
}
return true;
@@ -206,7 +206,7 @@
while(($file =self::_scandir($d)) !== false) {
if ($file != "." && $file != "..") {
$typepath = $mypath . "/" . $file ;
- if (filetype ($typepath) == 'dir')
+ if (filetype ($typepath) == 'dir')
self::_chown($typepath, $uid, $gid);
self::_chmod($typepath, $uid);
@@ -220,7 +220,7 @@
@brief Copy repertoire recursif
@param $src absolute path
@param $dst absolute path
- @return boolean true if ok
+ @return boolean true if ok
*/
public static function _copy($src,$dst){
@@ -269,9 +269,9 @@
$arrScanCache=array();
static $arrScanCache;
- if( ! is_dir($strFolder))
+ if( ! is_dir($strFolder))
$strFolder = dirname($strFolder);
- if (substr($strFolder, -1, 1) != '/')
+ if (substr($strFolder, -1, 1) != '/')
$strFolder .= '/';
// Load from cache
@@ -294,7 +294,7 @@
@return bool
*/
public static function equal_files($file1, $file2) {
- if (is_file($file1) && is_file($file2))
+ if (is_file($file1) && is_file($file2))
return (md5_file($file1) == md5_file($file2));
return false;
}
Modified: branches/2.1.1/catalog/admin/includes/classes/menu.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/menu.php 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/classes/menu.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -198,12 +198,12 @@
$format=(!$rec)?$this->format_line_box_open_entete: $this->format_line_box_open ;
/* Boucle pour sous menu avec entete de menu non clickable*/
$link1 .=sprintf($format,
- sprintf($this->format,$this->id_css('act'.$i),'index.php?type='.$r['value'][2],tep_cst_menu_conf($r['value'][1]),' class="menuBoxContentLink '.$r['value'][2].'" '.
+ sprintf($this->format,$this->id_css('act'.$i),'index.php?type='.$r['value'][2],tep_cst_menu_conf($r['value'][1]),' class="sub menuBoxContentLink '.$r['value'][2].'" '.
sprintf($this->format_js,$i)
),
$this->cstr_tbl_rec($r['value'][4],$r['key']),
$this->id_css('menu'.$i.'Container'),
- $r['key'].'_'.$r['value'][2].((isset($this->menu_acl[$acl_for_ctr]) || !isset($r['value'][5])) ?'' : ' disabled ')
+ @$tp.' '.$r['key'].'_'.$r['value'][2].((isset($this->menu_acl[$acl_for_ctr]) || !isset($r['value'][5])) ?'' : ' disabled ')
);
$ssmenu++;
@@ -217,7 +217,7 @@
/* Boucle pour sous menu avec entete de menu en liens vers page*/
$link=(preg_match("/[0-9]{2}_[a_z].*/",$r['value'][0]))? 'index.php?type='.$r['value'][2]: $r['value'][0];
$link1 .=sprintf($format,
- sprintf($this->format,$this->id_css('act'.$i),tep_href_link($link),tep_cst_menu_conf($r['value'][1]),' class="menuBoxContentLink '.$r['value'][2].'" '.
+ sprintf($this->format,$this->id_css('act'.$i),tep_href_link($link),tep_cst_menu_conf($r['value'][1]),' class=" menuBoxContentLink '.$r['value'][2].'" '.
sprintf($this->format_js,$i)
),
$this->cstr_tbl_rec($r['value'][4],$r['key']),
@@ -284,7 +284,7 @@
if(!isset($this->menu_acl[$acl_for_ctr]) || empty($this->menu_maintenance[$acl_for_ctr]['admin_groups_id'])) {
$this->update_acl_mini($this->menu_maintenance[$acl_for_ctr]['admin_files_id']);
}
-// echo $r['key'].' '.$acl_for_ctr.'<br >';
+
$array_s[$r['key']]=array('type'=>'ss_menu',
'etat'=>((!isset($this->menu_acl[$acl_for_ctr])) ? 'false' : 'true'),
'admin_files_id'=>$this->menu_maintenance[$acl_for_ctr]['admin_files_id'],
@@ -297,7 +297,7 @@
'class'=>'menuBoxContentLink '.$r['value'][2],
'CONTENEUR_class'=>'menuBoxContentLink '.$r['value'][2],
'CONTENEUR_id'=>$this->id_css('act'.$i),
- 'CONTENU_class'=>$r['key'].'_'.$r['value'][2].((!isset($this->menu_acl[$acl_for_ctr])) ?' disabled ' : ''),
+ 'CONTENU_class'=>$r['key'].'_'.$r['value'][2].((!isset($this->menu_acl[$acl_for_ctr])) ?' disabled ' : ''),
'CONTENU_id'=>$this->id_css('menu'.$i.'Container'),
'id'=>$this->id_css('act'.$i),
'js'=> sprintf($this->format_js,$i),
Modified: branches/2.1.1/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- branches/2.1.1/catalog/admin/includes/content/configuration.central.inc 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/content/configuration.central.inc 2012-08-02 06:58:56 UTC (rev 4545)
@@ -24,10 +24,12 @@
</div>
<h3 class="main-title"><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
+<div class="block_uniq">
<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
- <div class="box_left">
+ <div class="edit">
+<fieldset class="block_field">
<ul class="block_form tirroirs">
<?php foreach($list_edit as $row) { ?>
<li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>" class="Ctrtirroir"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
@@ -41,16 +43,15 @@
</li>
<?php } ?>
</ul>
- </div>
- <div class="box_right">
- <ul>
+
<div class="button_nav">
<?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID )) ; ?>
</div>
- </li>
- </ul>
+</fieldset>
+<br class="clear" />
</div>
</form>
+ </div>
<?php endif; ?>
<!-- body_text_eof //-->
<!-- body_eof //-->
\ No newline at end of file
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-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -22,7 +22,7 @@
<legend><?php echo __('@filters filter legend choose categorie'); ?></legend>
<ul >
<?php foreach(categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$languages_id , 'exclude'=>array('0'))) as $k=>$item): ?>
- <li>
+ <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')); ?>
<?php echo (is_array($item)? $item['text'] : $item ) ?>
</li>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -23,7 +23,7 @@
<fieldset>
<legend><?php echo __('@filters filter legend choose featured'); ?></legend>
- <ul >
+ <ul class="<?php echo ((bool)((string)$_SESSION['filters']['featured'][$item->id] == 'on')? 'select' : '' ) ?>">
<?php foreach($list as $k=>$item): ?>
<li>
<?php echo tep_draw_checkbox_field('filters[featured]['.$item->id.']', 'filters[featured]['.$item->id.']', 'on', (bool) ((string)$_SESSION['filters']['featured'][$item->id] == 'on')); ?>
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-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -15,7 +15,7 @@
<ul class="inline">
<?php foreach(MGabCont::CallSt('DFilterAllfields') as $k=>$item):
$clean = substr($k, (strpos($k, '.')+1)); ?>
- <li>
+ <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')); ?>
<?php echo (is_array($item)? $item['text'] : $item ) ?>
</li>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -14,7 +14,7 @@
<legend><?php echo __('@filters filter legend choose subtype'); ?></legend>
<ul class="inline">
<?php foreach(tep_get_status_array(MGabCont::CallSt('GetClassDatatype')) as $item): ?>
- <li>
+ <li class="<?php echo ((bool)(count(@$_SESSION['filters']['subtype']) <1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')? 'select' : '' ) ?>" >
<?php echo tep_draw_checkbox_field('filters[subtype]['.$item['id'] .']', 'filters[subtype]['.$item['id'].']', 'on', (bool)(count(@$_SESSION['filters']['subtype']) <1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')); ?>
<?php echo $item['text'] ?>
</li>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -17,6 +17,8 @@
echo '<a class="button" href="' . tep_href_link(adminGroup::FILENAME) . '">' . IMAGE_CANCEL . '</a>';?>
</div>
<div class="box_uniq">
+
+ <div class="edit">
<table style="width:100%">
<thead>
<tr>
@@ -112,5 +114,6 @@
<?php } ?>
</tbody>
</table>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -14,6 +14,8 @@
<?php echo tep_draw_form('newsletter', adminGroup::FILENAME, 'gID='.@$_GET['gID'].'&action='. ((adminGroup::$action == 'edit')? 'group_edit' : 'new_confirm') , 'post' ); ?>
<div class="box_uniq">
+
+ <div class="edit">
<p><?php if (adminGroup::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', (int)$_GET['gID'] ); ?></p>
<fieldset class="block_field">
@@ -31,6 +33,7 @@
echo '<a class="button" href="' . tep_href_link(adminGroup::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
</div>
+ <br class="clear" />
</div>
-
+ </div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -19,8 +19,8 @@
<ul>
<li><a href="#tabs-1"><?php echo __('adminUsers tab specification'); ?></a></li>
</ul>
+ <div class="edit">
-
<div id="tabs-1" class="tabPage">
<?php echo tep_draw_form('adminUsers', adminUsers::FILENAME, 'action='.((adminUsers::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
@@ -65,5 +65,5 @@
<br class="clear" />
</div>
-
+ </div>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -11,7 +11,7 @@
?>
<h3><?php echo __('heading title') ?></h3>
<?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action='.((attributes::$action=='new')? 'insert':'update'), 'post') ?>
-
+<div class="edit">
<fieldset class="tabs_lang block_field">
<ul>
<?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
@@ -62,4 +62,7 @@
<fieldset class="block_field button_nav">
<?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
</fieldset>
+
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -19,70 +19,72 @@
<div class="box_uniq block_form">
<?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
- <div class="edit box_left w_70">
+
<div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
- <?php
- $g=3;
- categories::$modules->display_edit($contents,@$_GET['cID']);
- if(is_array($contents))
- foreach ($contents as $value) {
- if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
- $g++;
- } ?>
- </ul>
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
+ <?php
+ $g=3;
+ categories::$modules->display_edit($contents,@$_GET['cID']);
+ if(is_array($contents))
+ foreach ($contents as $value) {
+ if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
+ $g++;
+ } ?>
+ </ul>
- <div id="tabs-1" class="tabPage">
+ <div class="edit box_left w_70">
-<!-- <p class="block_input"> -->
+ <div id="tabs-1" class="tabPage">
- <div class="tabs_lang">
- <ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image( categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+ <!-- <p class="block_input"> -->
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <fieldset id="fieldset_<?php echo $i ?>">
- <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
- <p class="block_input" style="width:90%;">
- <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
- <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
- </p>
- <br style="clear:both" />
- <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
- <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
- </fieldset>
- <?php } ?>
- </div>
+ <div class="tabs_lang">
+ <ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image( categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <fieldset id="fieldset_<?php echo $i ?>">
+ <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
+ <p class="block_input" style="width:90%;">
+ <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
+ <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
+ </p>
+ <br style="clear:both" />
+ <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
+ </fieldset>
+ <?php } ?>
+ </div>
- <p class="block_input">
- <Label><?php echo __('text edit sort order') ?></label>
- <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
- <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+ <p class="block_input">
+ <Label><?php echo __('text edit sort order') ?></label>
+ <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
- </p>
+ <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+ </p>
- <div class="block_input">
- <Label><?php echo __('text edit datatype categorie') ?></label>
- <ul>
- <?php foreach($DT->GetTypeForRootListing() as $k=>$row): ?>
- <li><?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , $row , (in_array($row, explode(',', categories::$cInfo->categories_datatype))? true : false) ) . ' '. $row ?></li>
- <?php endforeach; ?>
- <li><hr />
- <?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , 'NULL' , ((categories::$cInfo->categories_datatype == '')? true : false) ) . ' '. __('input datatype value none') ?></li>
- </ul>
- </div>
- </div>
+ <div class="block_input">
+ <Label><?php echo __('text edit datatype categorie') ?></label>
+ <ul>
+ <?php foreach($DT->GetTypeForRootListing() as $k=>$row): ?>
+ <li><?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , $row , (in_array($row, explode(',', categories::$cInfo->categories_datatype))? true : false) ) . ' '. $row ?></li>
+ <?php endforeach; ?>
+ <li><hr />
+ <?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , 'NULL' , ((categories::$cInfo->categories_datatype == '')? true : false) ) . ' '. __('input datatype value none') ?></li>
+ </ul>
+ </div>
+ </div>
+
<?php
$g=3;
if(is_array($contents)){
Modified: branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -77,12 +77,12 @@
<fieldset class="block_field">
<dl>
- <dt class="block_input w_90">
+ <dt class="block_input">
<label for="content_name" title="<?php echo __('entry content help'); ?>"><?php echo __('entry content').tep_image(DIR_WS_ICONS .'icon_help.gif') ?></label>
<?php echo tep_draw_input_field('content_name', '', cms_content::$Info->name) . tep_draw_hidden_field('p_format','','HTML'); ?>
</dt>
- <dt class="block_input w_90">
+ <dt class="block_input">
<label><?php echo __('text content status'); ?></label>
<?php echo tep_draw_radio_field('content_status', 'content_status_1', '1', cms_content::$enabled_status) . __('text content enabled') . tep_draw_radio_field('content_status', 'content_status_0', '0', cms_content::$disabled_status) . __('text content disabled'); ?>
</dt>
@@ -90,13 +90,13 @@
<!-- All LinkTo -->
<?php foreach(MLinkTo::LoadRightTo( 'content', 'edit' , 'action='.cms_content::$action.'&cID='.@$_GET['cID'] ) as $row): ?>
- <dt class="block_input w_90">
+ <dt class="block_input">
<?php echo $row['text'] ;?>
</dt>
<?php endforeach;?>
- <dt class="block_input button_nav w_90" >
+ <dt class="block_input button_nav" >
<?php echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );?>
<?php echo tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$Info->id), IMAGE_CANCEL); ?>
</dt>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -16,6 +16,7 @@
<h4><?php echo __('heading edit') ?></h4>
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
+ <div class="edit">
<p>
<?php echo tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
@@ -117,6 +118,9 @@
<div class="button_nav">
<?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34. '&eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
+
+<br class="clear" />
+</div>
</form>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -18,9 +18,9 @@
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=insert', 'post'); ?>
+ <div class="edit">
-
<fieldset class="block_field">
<label><?php echo __('entry type input') ?></label>
<?php //echo tep_draw_radio_field('value_list','value_list', '1',(((int)modprodextra::$cInfo->epf_uses_value_list==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)modprodextra::$cInfo->epf_uses_value_list==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
@@ -57,6 +57,9 @@
// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
+
+<br class="clear" />
+</div>
</form>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -15,72 +15,72 @@
<?php echo tep_draw_form('featureds', featureds::FILENAME, 'action='.((featureds::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
<div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('@featureds tab specification'); ?></a></li>
- </ul>
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('@featureds tab specification'); ?></a></li>
+ </ul>
+ <div class="edit">
+ <div id="tabs-1" class="tabPage">
- <div id="tabs-1" class="tabPage">
-
- <div class="tabs_lang">
- <ul>
+ <div class="tabs_lang">
+ <ul>
+ <?php foreach(tep_get_languages() as $lg): ?>
+ <li>
+ <a href="#fieldset_<?php echo $lg['id'] ?>">
+ <?php echo tep_language_image($lg['directory'] . '/images/' .$lg['image'], $lg['name']); ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
<?php foreach(tep_get_languages() as $lg): ?>
- <li>
- <a href="#fieldset_<?php echo $lg['id'] ?>">
- <?php echo tep_language_image($lg['directory'] . '/images/' .$lg['image'], $lg['name']); ?>
- </a>
- </li>
+ <fieldset id="fieldset_<?php echo $lg['id'] ?>" class="block_field">
+ <p class="block_input">
+ <label for="<?php echo 'title' . $lg['id']; ?>"><?php echo __('@featureds entry title'); ?></label>
+ <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], @featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
+ </p>
+ </fieldset>
<?php endforeach; ?>
- </ul>
- <?php foreach(tep_get_languages() as $lg): ?>
- <fieldset id="fieldset_<?php echo $lg['id'] ?>" class="block_field">
- <p class="block_input">
- <label for="<?php echo 'title' . $lg['id']; ?>"><?php echo __('@featureds entry title'); ?></label>
- <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], @featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
- </p>
- </fieldset>
- <?php endforeach; ?>
- </div>
+ </div>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds keys') ?></label>
- <?php echo tep_draw_input_field('featureds_key', '', @featureds::$Info->uniqkey) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds keys') ?></label>
+ <?php echo tep_draw_input_field('featureds_key', '', @featureds::$Info->uniqkey) ?>
+ </p>
- <p class="block_input">
- <label ><?php echo __('@featureds text info type'); ?></label>
- <?php echo tep_draw_pull_down_menu('featureds_type', tep_get_status_array('featured',0,'status_name'),featureds::$Info->type); ?>
- </p>
+ <p class="block_input">
+ <label ><?php echo __('@featureds text info type'); ?></label>
+ <?php echo tep_draw_pull_down_menu('featureds_type', tep_get_status_array('featured',0,'status_name'),featureds::$Info->type); ?>
+ </p>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds min') ?></label>
- <?php echo tep_draw_input_field('featureds_min', '', featureds::$Info->min) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds min') ?></label>
+ <?php echo tep_draw_input_field('featureds_min', '', featureds::$Info->min) ?>
+ </p>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds max') ?></label>
- <?php echo tep_draw_input_field('featureds_max', '', featureds::$Info->max) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds max') ?></label>
+ <?php echo tep_draw_input_field('featureds_max', '', featureds::$Info->max) ?>
+ </p>
-<!-- <p class="block_input">
- <Label><?php //echo __('text info featureds visible') ?></label>
- <?php //echo tep_draw_radio_field('featureds_visible', 'featureds_visible_1', '1', $featureds_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('featureds_visible', 'featureds_visible_0', '0', $featureds_visible_N) . ' ' . VISIBLE_NO ?>
- </p>-->
+ <!-- <p class="block_input">
+ <Label><?php //echo __('text info featureds visible') ?></label>
+ <?php //echo tep_draw_radio_field('featureds_visible', 'featureds_visible_1', '1', $featureds_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('featureds_visible', 'featureds_visible_0', '0', $featureds_visible_N) . ' ' . VISIBLE_NO ?>
+ </p>-->
- <p class="block_input button_nav">
- <?php
- echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
- echo tep_js_back(tep_href_link(featureds::FILENAME), IMAGE_CANCEL) ;
- ?>
- </p>
+ <p class="block_input button_nav">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
+ echo tep_js_back(tep_href_link(featureds::FILENAME), IMAGE_CANCEL) ;
+ ?>
+ </p>
+ <br class="clear" />
+ </div>
</div>
-
- <br class="clear" />
</div>
</form>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -12,7 +12,7 @@
<div class="button_nav">
- <?php if (geo_zones::$action =='listing') echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES, tep_get_all_get_params(array('action','sID')). '&action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
+ <?php if (!geo_zones::$action) echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES, tep_get_all_get_params(array('action','sID')). '&action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
</div>
<div class="box_uniq">
Modified: branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -22,7 +22,7 @@
<li><a href="#tabs-2"><?php echo __('@navigation_links tab other'); ?></a></li>
</ul>
-
+ <div class="edit">
<div id="tabs-1" class="tabPage">
@@ -95,5 +95,6 @@
<br class="clear" />
</div>
+ </div>
</form>
</div>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -13,7 +13,7 @@
<h3><?php echo __('heading title '.((newsletters::$action == 'edit')?'edit' : 'new') ) ?></h3>
<?php echo tep_draw_form('newsletter', newsletters::FILENAME, 'action='.((newsletters::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
-
+<div class="edit">
<div class="box_left">
<div id="tabs">
<ul>
@@ -91,5 +91,6 @@
<?php if (newsletters::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newsletters::$nID); ?>
</div>
</div>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -13,6 +13,7 @@
<h3><?php echo __('heading title') ?></h3>
<?php echo tep_draw_form('newsletter', newslettersModeles::FILENAME, 'action='.((newslettersModeles::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
+<div class="edit">
<div class="box_left">
<p><?php if (newslettersModeles::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newslettersModeles::$nID); ?></p>
<fieldset class="block_field">
@@ -48,5 +49,6 @@
echo '<a class="button" href="' . tep_href_link(newslettersModeles::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
</div>
</div>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.clause.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.clause.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/orders/filter.clause.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -13,15 +13,15 @@
<legend><?php echo __('@orders filter legend choose dates'); ?></legend>
<ul class="inline">
<li class="inline">
- <label for="filters[dates][start]"><?php echo __('@orders text products date start'); ?></label>
+ <label for="filters[dates][start]"><?php echo __('@orders text date start'); ?></label>
<?php echo tep_draw_input_field('filters[dates][start]', 'filters_start', tep_date_short( @$_SESSION['filters']['dates']['start'] ), ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_filters_start'); ?>
</li>
<li class="inline">
- <label for="filters[dates][end]"><?php echo __('@orders text products date end'); ?></label>
+ <label for="filters[dates][end]"><?php echo __('@orders text date end'); ?></label>
<?php echo tep_draw_input_field('filters[dates][end]', 'filters_end', tep_date_short( @$_SESSION['filters']['dates']['end'] ), ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_filters_end'); ?>
</li>
<li class="inline">
- <?php echo ' ' . __('text products date format'); ?>
+ <?php echo ' ' . __('@orders text date format'); ?>
</li>
</ul>
</fieldset>
Modified: branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-08-02 06:58:56 UTC (rev 4545)
@@ -15,7 +15,7 @@
<?php echo tep_draw_form('new_product', products::FILENAME, 'pID='.$_GET['pID'].'&action=update_product', 'post', 'enctype="multipart/form-data"'); ?>
<div class="block_form">
- <div class="edit box_left w_70">
+
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
@@ -29,6 +29,7 @@
} ?>
</ul>
+ <div class="edit box_left w_70">
<div id="tabs-1" class="tabPage">
<fieldset class="tabs_lang block_field">
@@ -207,43 +208,44 @@
<div class="edit box_right fright w_30">
<fieldset class="block_field">
- <legend><?php echo __('text legend image'); ?></legend>
- <dl>
- <dt class="block_input">
- <p class="new_product_img" ><?php echo tep_info_image(products::$Info->products_image, products::$Info->products_image, TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT, 'class="new_product_img" id="products_imageimg"'); ?></p>
- </dt>
- <?php if(products::CheckClassProduct('CLASS_IMAGE')): /** Si image de prix defini, les prix sont pris en charge par un onglet */ ?>
- <dt class="block_input">
- <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'return false;">'.tep_draw_input_field('products_image','', products::$Info->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
- </dt>
- <?php endif; ?>
- </dl>
+ <legend><?php echo __('text legend image'); ?></legend>
+ <dl>
+ <dt class="block_input">
+ <p class="new_product_img" ><?php echo tep_info_image(products::$Info->products_image, products::$Info->products_image, TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT, 'class="new_product_img" id="products_imageimg"'); ?></p>
+ </dt>
+ <?php if(products::CheckClassProduct('CLASS_IMAGE')): /** Si image de prix defini, les prix sont pris en charge par un onglet */ ?>
+ <dt class="block_input">
+ <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'return false;">'.tep_draw_input_field('products_image','', products::$Info->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
+ </dt>
+ <?php endif; ?>
+ </dl>
</fieldset>
<fieldset class="block_field">
- <dl>
- <dd class="block_input">
- <label><?php echo __('text products status'); ?></label>
- <?php echo tep_draw_radio_field('products_status', 'products_status_1', '1', products::$in_status,'','class="radio"') . __('text product available') . tep_draw_radio_field('products_status', 'products_status_0', '0', products::$out_status,'','class="radio"') . __('text product not available'); ?>
- </dd>
+ <dl>
+ <dd class="block_input">
+ <label><?php echo __('text products status'); ?></label>
+ <?php echo tep_draw_radio_field('products_status', 'products_status_1', '1', products::$in_status,'','class="radio"') . __('text product available') . tep_draw_radio_field('products_status', 'products_status_0', '0', products::$out_status,'','class="radio"') . __('text product not available'); ?>
+ </dd>
- <!-- All LinkTo -->
- <?php foreach(MLinkTo::LoadRightTo( 'products', 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
- <dt class="block_input w_90">
- <?php echo $row['text'] ;?>
- </dt>
- <?php endforeach;?>
+ <!-- All LinkTo -->
+ <?php foreach(MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
+ <dt class="block_input w_90">
+ <?php echo $row['text'] ;?>
+ </dt>
+ <?php endforeach;?>
- <dd class="block_input button_nav" style="width:95%;">
- <?php
- echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
- echo tep_js_back(tep_href_link(products::FILENAME, (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : '')), IMAGE_CANCEL) ;
- ?>
- </dd>
- </dl>
- </fieldset>
+ <dd class="block_input button_nav" style="width:95%;">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
+ echo tep_js_back(tep_href_link(products::FILENAME, (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : '')), IMAGE_CANCEL) ;
+ ?>
+ </dd>
+ </dl>
+ </fieldset>
</div>
+
<div class="separator"></div>
</div>
</form>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -36,4 +36,10 @@
/* Block general */
$lang['module acapro headertags text title']="Contrôle tags entête" ;
$lang['module acapro headertags text description']="Contrôle tags entête" ;
+
+/* Filtre dans les pages datatype */
+$lang['@header_tags table heading title']="meta titre" ;
+$lang['@header_tags table heading description']="meta description" ;
+$lang['@header_tags table heading tags']="meta tags" ;
+
?>
\ No newline at end of file
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -9,16 +9,16 @@
@encode UTF-8
*/
-$lang['heading datatypeaccount configuration']="Configuration produits" ;
+$lang['heading datatypeaccount configuration']="Configuration clients/membres" ;
$lang['datatypeaccount tab configuration']="Configuration" ;
$lang['datatypeaccount tab module']="Modules" ;
/* tab configuration */
- $lang['heading datatypeaccount manage type accounts']="Gestion des types de produits" ;
- $lang['datatypeaccount legend manage type']="Types de produits" ;
- $lang['datatypeaccount type txt intro']="Les types de produits modifie le fonctionnement des produits, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos produits. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
+ $lang['heading datatypeaccount manage type accounts']="Gestion des types de clients/membres" ;
+ $lang['datatypeaccount legend manage type']="Types de clients/membres" ;
+ $lang['datatypeaccount type txt intro']="Les types de clients/membres modifie le fonctionnement des clients/membres, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos clients/membres. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
$lang['datatypeaccount tableheading id']="Id" ;
$lang['datatypeaccount tableheading active']="Actif" ;
@@ -33,7 +33,7 @@
$lang['datatypeaccount tab virtual']="virtuel" ;
/* tab modules */
- $lang['datatypeaccount heading modules']="Activer / desactiver l'ensemble des modules specifique aux produits" ;
+ $lang['datatypeaccount heading modules']="Activer / desactiver l'ensemble des modules specifique aux clients/membres" ;
$lang['table heading module code']="Nom" ;
$lang['table heading module title']="Description" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -26,6 +26,8 @@
$lang['cms_content table heading categories']="Catégorie" ;
$lang['cms_content table heading categories id']="Cat. id" ;
$lang['cms_content table heading title']="Titre" ;
+ $lang['cms_content table heading featured']="Mise en avant" ;
+ $lang['cms_content table heading featured id']="Mea.id" ;
$lang['cms_content table heading date_added']="Crée(s)" ;
$lang['cms_content table heading last modified']="Modifié(s)" ;
$lang['cms_content table heading status']="État" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -29,6 +29,7 @@
/* Edit */
$lang['definir le module utilise']="Module utilisé" ;
+ $lang['module txt name']="Choix du module à utiliser" ;
$lang['definir le delai de repetition']="Délais de répétition" ;
$lang['definir la date de premiere execution']="Date de premiere execution" ;
$lang["definir si l'execution est unique"]="Repetition" ;
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-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/customers.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -26,7 +26,7 @@
$lang['@customers table heading create']="Creer" ;
$lang['@customers table heading last logon']="Accès" ;
$lang['@customers table heading last modified']="Modifiés" ;
- $lang['@customers table heading date added']="Créers" ;
+ $lang['@customers table heading date added']="Crées" ;
$lang['@customers table heading points']="points" ;
$lang['@customers table heading action']="Action" ;
$lang['@customers table heading status']="Etat" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -13,6 +13,7 @@
/* Listing */
$lang['heading title featureds'] = "Mise en avant" ;
+
$lang['@featureds table heading id'] = "Id" ;
$lang['@featureds table heading datatype id'] = "Id." ;
$lang['@featureds table heading min'] = "Min." ;
@@ -33,6 +34,8 @@
/* Edit / add */
+ $lang['heading title edit'] = "Edition" ;
+
$lang['@featureds tab specification'] = "Caractéristique" ;
$lang['@featureds entry title'] = "Titre" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -23,6 +23,7 @@
$lang['heading title admin']="Tableau de bord des utilisateurs et groupes privés" ;
$lang['heading title services']="Tableau de bord des services" ;
$lang['heading title shipping']="Tableau de bord des expeditions" ;
+$lang['heading title system']="Systeme " ;
$lang['heading title config_100']="Configuration de l'apparence" ;
$lang['heading title config_110']="Configuration de base" ;
Modified: branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2012-08-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2012-08-02 06:58:56 UTC (rev 4545)
@@ -23,8 +23,9 @@
$lang['@orders filter legend choose status']="Statut visible" ;
$lang['@orders filter legend choose dates']="Periode" ;
- $lang['@orders text products date start']="Début" ;
- $lang['@orders text products date end']="Fin" ;
+ $lang['@orders text date start']="Début" ;
+ $lang['@orders text date end']="Fin" ;
+ $lang['@orders text date format']="Format (jj/mm/aaaa)" ;
/* Fields */
$lang['orders table heading order id']="n°" ;
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-01 19:21:28 UTC (rev 4544)
+++ branches/2.1.1/catalog/admin/includes/modules/content/header_tags.php 2012-08-02 06:58:56 UTC (rev 4545)
@@ -23,11 +23,11 @@
*/
public static $pInfo;
- var $code;
- var $title;
- var $description;
- var $sort_order;
- var $enabled;
+ public $code;
+ public $title;
+ ...
[truncated message content] |
|
From: <os...@us...> - 2012-08-01 19:21:34
|
Revision: 4544
http://oscss.svn.sourceforge.net/oscss/?rev=4544&view=rev
Author: oscim
Date: 2012-08-01 19:21:28 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Report class css manquante
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
trunk/catalog/admin/includes/template/oscss/styles.less
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-08-01 10:37:03 UTC (rev 4543)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.edit.gab 2012-08-01 19:21:28 UTC (rev 4544)
@@ -16,6 +16,7 @@
<h4><?php echo __('heading edit') ?></h4>
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=update' . '&confirm=yes&eid=' . modprodextra::$eid , 'post'); ?>
+ <div class="edit">
<p>
<?php echo tep_draw_hidden_field('value_list','value_list', (((int)modprodextra::$cInfo->epf_uses_value_list==1)? '1' : '0')) ?>
@@ -117,6 +118,9 @@
<div class="button_nav">
<?php echo tep_image_submit('button_save.gif', IMAGE_SAVE) . ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, FILENAME_CFG_34. '&eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
+
+<br class="clear" />
+</div>
</form>
</div>
Modified: trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-08-01 10:37:03 UTC (rev 4543)
+++ trunk/catalog/admin/includes/gabarit/configuration/modprodextra/draw.label.new.gab 2012-08-01 19:21:28 UTC (rev 4544)
@@ -18,9 +18,9 @@
<?php echo tep_draw_form('field_entry',FILENAME_CONFIGURATION, FILENAME_CFG_34. '&action=insert', 'post'); ?>
+ <div class="edit">
-
<fieldset class="block_field">
<label><?php echo __('entry type input') ?></label>
<?php //echo tep_draw_radio_field('value_list','value_list', '1',(((int)modprodextra::$cInfo->epf_uses_value_list==1)? true : false)) . ' ' .__('TEXT_YES'). ' ' . tep_draw_radio_field('value_list','value_list', '0',(((int)modprodextra::$cInfo->epf_uses_value_list==0)? true : false)) . ' ' .__('TEXT_NO'); ?>
@@ -57,6 +57,9 @@
// ' <a class="button" href="' . tep_href_link(FILENAME_CONFIGURATION, tep_get_all_get_params(array('action','flag','eid')) . 'eid=' . modprodextra::$eid) . '">' . IMAGE_CANCEL . "</a>\n" ?>
</div>
+
+<br class="clear" />
+</div>
</form>
</div>
Modified: trunk/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/styles.less 2012-08-01 10:37:03 UTC (rev 4543)
+++ trunk/catalog/admin/includes/template/oscss/styles.less 2012-08-01 19:21:28 UTC (rev 4544)
@@ -47,13 +47,16 @@
@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 : #E6FF99; // cols sorting
- @color_sorting_text : black;
+ @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;
@@ -785,15 +788,28 @@
&:hover{
background-color: @bg_hover;
cursor: pointer;
+
+ td{
+ background-color: @bg_hover;
+ }
+ td,
+ td a {
+ color : @bg_hover_txt ;
+ }
}
td{
line-height:12px;
- color: #000000;
+ 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;}
@@ -821,35 +837,32 @@
min-width:100px;
text-align:left;
}
- .sorting_1 {
- color : @color_sorting_text;
- background-color: @color_sorting;
- }
- .sorting_2 {
- color : @color_sorting_text;
- background-color:( @color_sorting + 25);
+ .sorting_1{
+ background-color: ( @color_sorting + 50);
}
-
- .sorting_3 {
- color : @color_sorting_text;
- background-color:( @color_sorting + 50);
+ .sorting_1,
+ .sorting_1 a{
+ color : ( @color_sorting_text + 50);
}
- .sorting_4 {
- color : @color_sorting_text;
- background-color:( @color_sorting + 75);
+ .sorting_2{
+ background-color:( @color_sorting + 60);
}
+ .sorting_2,
+ .sorting_2 a{
+ color :( @color_sorting_text + 60);
+ }
- .sorting_5 {
- color : @color_sorting_text;
- background-color:( @color_sorting + 100);
+ .sorting_3{
+ background-color:( @color_sorting + 70);
}
+ .sorting_3,
+ .sorting_3 a{
+ color : (@color_sorting_text + 70);
+ }
+
- .sorting_6 {
- color : @color_sorting_text;
- background-color:( @color_sorting + 125);
- }
}
.odd{
@@ -1051,14 +1064,9 @@
textarea{ vertical-align:baseline;}
p{
- img{
- border:1px solid #ACAAAC;
- .border-radius(5px,5px,5px,5px);
- max-width: 300px;
- }
-
+
- input[type="radio"],
+// input[type="radio"],
input[type="checkbox"] { float:right; }
select,
@@ -1083,6 +1091,9 @@
margin : 0 auto;
text-align:center;
width:98%;
+ border:1px solid #ACAAAC;
+ .border-radius(5px,5px,5px,5px);
+ max-width: 300px;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-08-01 10:37:10
|
Revision: 4543
http://oscss.svn.sourceforge.net/oscss/?rev=4543&view=rev
Author: oscim
Date: 2012-08-01 10:37:03 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
correction coquille php
ajustement templaet BO
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/menu.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/modules/products/header_tags.php
trunk/catalog/admin/includes/template/oscss/styles.less
Modified: trunk/catalog/admin/includes/classes/menu.php
===================================================================
--- trunk/catalog/admin/includes/classes/menu.php 2012-07-31 17:43:26 UTC (rev 4542)
+++ trunk/catalog/admin/includes/classes/menu.php 2012-08-01 10:37:03 UTC (rev 4543)
@@ -198,12 +198,12 @@
$format=(!$rec)?$this->format_line_box_open_entete: $this->format_line_box_open ;
/* Boucle pour sous menu avec entete de menu non clickable*/
$link1 .=sprintf($format,
- sprintf($this->format,$this->id_css('act'.$i),'index.php?type='.$r['value'][2],tep_cst_menu_conf($r['value'][1]),' class="menuBoxContentLink '.$r['value'][2].'" '.
+ sprintf($this->format,$this->id_css('act'.$i),'index.php?type='.$r['value'][2],tep_cst_menu_conf($r['value'][1]),' class="sub menuBoxContentLink '.$r['value'][2].'" '.
sprintf($this->format_js,$i)
),
$this->cstr_tbl_rec($r['value'][4],$r['key']),
$this->id_css('menu'.$i.'Container'),
- $r['key'].'_'.$r['value'][2].((isset($this->menu_acl[$acl_for_ctr]) || !isset($r['value'][5])) ?'' : ' disabled ')
+ @$tp.' '.$r['key'].'_'.$r['value'][2].((isset($this->menu_acl[$acl_for_ctr]) || !isset($r['value'][5])) ?'' : ' disabled ')
);
$ssmenu++;
@@ -217,7 +217,7 @@
/* Boucle pour sous menu avec entete de menu en liens vers page*/
$link=(preg_match("/[0-9]{2}_[a_z].*/",$r['value'][0]))? 'index.php?type='.$r['value'][2]: $r['value'][0];
$link1 .=sprintf($format,
- sprintf($this->format,$this->id_css('act'.$i),tep_href_link($link),tep_cst_menu_conf($r['value'][1]),' class="menuBoxContentLink '.$r['value'][2].'" '.
+ sprintf($this->format,$this->id_css('act'.$i),tep_href_link($link),tep_cst_menu_conf($r['value'][1]),' class=" menuBoxContentLink '.$r['value'][2].'" '.
sprintf($this->format_js,$i)
),
$this->cstr_tbl_rec($r['value'][4],$r['key']),
@@ -284,7 +284,7 @@
if(!isset($this->menu_acl[$acl_for_ctr]) || empty($this->menu_maintenance[$acl_for_ctr]['admin_groups_id'])) {
$this->update_acl_mini($this->menu_maintenance[$acl_for_ctr]['admin_files_id']);
}
-// echo $r['key'].' '.$acl_for_ctr.'<br >';
+
$array_s[$r['key']]=array('type'=>'ss_menu',
'etat'=>((!isset($this->menu_acl[$acl_for_ctr])) ? 'false' : 'true'),
'admin_files_id'=>$this->menu_maintenance[$acl_for_ctr]['admin_files_id'],
@@ -297,7 +297,7 @@
'class'=>'menuBoxContentLink '.$r['value'][2],
'CONTENEUR_class'=>'menuBoxContentLink '.$r['value'][2],
'CONTENEUR_id'=>$this->id_css('act'.$i),
- 'CONTENU_class'=>$r['key'].'_'.$r['value'][2].((!isset($this->menu_acl[$acl_for_ctr])) ?' disabled ' : ''),
+ 'CONTENU_class'=>$r['key'].'_'.$r['value'][2].((!isset($this->menu_acl[$acl_for_ctr])) ?' disabled ' : ''),
'CONTENU_id'=>$this->id_css('menu'.$i.'Container'),
'id'=>$this->id_css('act'.$i),
'js'=> sprintf($this->format_js,$i),
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-07-31 17:43:26 UTC (rev 4542)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-08-01 10:37:03 UTC (rev 4543)
@@ -983,7 +983,7 @@
}
/* DEB Sub module add table */
- $r = self::$modules->__call('GetConf', array('languages_id'=>$languages_id, 'type'=>'tables')) ;
+ $r = self::$modules->__call('GetConf', array('languages_id'=>(int)$adjust->languages_id, 'type'=>'tables')) ;
foreach($r as $mod=>$value){
foreach($value as $key=>$string){
$query_raw .= $string;
Modified: trunk/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/header_tags.php 2012-07-31 17:43:26 UTC (rev 4542)
+++ trunk/catalog/admin/includes/modules/products/header_tags.php 2012-08-01 10:37:03 UTC (rev 4543)
@@ -97,8 +97,8 @@
case 'tables':
- $array['fht'] .= " LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=p.products_id AND fht.page_type='product' ) ";
- $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=p.products_id AND fht.page_type='product' ) ";
+ $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;
}
Modified: trunk/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/styles.less 2012-07-31 17:43:26 UTC (rev 4542)
+++ trunk/catalog/admin/includes/template/oscss/styles.less 2012-08-01 10:37:03 UTC (rev 4543)
@@ -22,7 +22,26 @@
@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_bouton_cl_1 : #AE0405 ;
+ @color_bouton_cl_2 : #AE0405 ;
+ @color_bouton_cl_3 : #FD3841 ;
+
+ // 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
@@ -137,7 +156,6 @@
.fieldRequired { color: #ff0000; }
.smallText { font-size: 0.8em; }
.errorText { color: #ff0000; }
- .text {margin:6px 0 ; padding: 6px}
/* --- message box --- */
@@ -216,10 +234,9 @@
}
.disabled{
+ display:none;
+
&:hover { display:none;}
-
- ul li a,
- ul li a:hover { display:none; }
}
.ssmenu a {
@@ -227,11 +244,11 @@
text-shadow: none;
padding:2px 0px 2px 26px;
text-decoration:none;
- line-height:20px;
+ line-height:(@lineheight * 1.1);
border:none;
- width:154px;
+// width:154px;
text-align:left;
- white-space:nowrap;
+// white-space:nowrap;
&:hover {
background-color:#999;
@@ -249,12 +266,19 @@
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: " >>"; }
+ }
}
}
@@ -277,6 +301,15 @@
float:none;
width:200px;
background:#303030 ;
+// z-index:15;
+
+// ul{
+// z-index:20;
+//
+// li{
+// z-index:25;
+// }
+// }
}
}
}
@@ -286,8 +319,7 @@
}
ul.fleft{
-// background:transparent url("img/1/bg-nav.jpg") repeat-x ;
- .gradient( #AE0405, #AE0405, #FD3841) ;
+ .gradient( @color_menu_nav_cl_1, @color_menu_nav_cl_2 , @color_menu_nav_cl_3) ;
a{
padding-top:4px;
@@ -316,7 +348,7 @@
.bw-gradient( #E4E4E4, 200, 255) ;
- option{ color:black;font-size:0.9em; }
+ option{ color:white;font-size:0.9em; }
}
}
@@ -398,7 +430,6 @@
background:black;
min-width:900px;
width:90%;
- max-width:1200px;
margin:0 0;
position:fixed;
z-index:10;
@@ -458,14 +489,13 @@
position: relative;
min-width:900px;
width:90%;
- max-width:1200px;
}
div#bas {
// margin-top:8em;
clear:both;
height:25px;
- background:black;
+ background:#303030;
color:white;
a,
@@ -482,7 +512,7 @@
.oscim { background: transparent url(img/1/ico_oscim_20.png) 0px 2px no-repeat; text-decoration:none; }
}
footer {
- background:#303030;
+ background: #505050;
clear:both;width:100%;
text-align:center;
color:white;
@@ -537,23 +567,30 @@
button.button{font-size:11px; background:#ccc;padding:2px 5px; }
- a.button{ background:#eee; padding:2px 5px; margin:10px 20px ;text-decoration:none;height:18px; line-height:18px;}
- a.button:hover{background:#797979; color:white;text-decoration:none; }
+ 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 {background:#df1217 url(img/1/button.jpg) left top repeat-x;}
+ 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 {background:#ccc url(img/1/button-submit.jpg) left top repeat-x;}
+ 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 {background:#ccc url(img/1/button-back.jpg) left top repeat-x;}
+ button.button.ActionBack {
+ color:white;
+ .gradient( @color_bouton_back_cl_1, @color_bouton_back_cl_3, @color_bouton_back_cl_2) ;
+ }
input:hover.button,
@@ -561,19 +598,30 @@
a:hover.button,
input:hover.button,
- button:hover.button {background:#ccc url(img/1/button.jpg) left -40px repeat-x; opacity:0.6;}
+ 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 {background:#ccc url(img/1/button-submit.jpg) left -40px repeat-x; color:black;}
+ 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;background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+ 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 {color:gray;}
+ 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;}
@@ -583,7 +631,7 @@
a.buttonimg img:hover{ opacity:0.6;}
/* Spe buttons broswer img */
- a.button.browser {height:28px;}
+ a.button.browser {height:24px;}
a.button img {vertical-align:middle;margin:0.3em 0.3em 0 0;}
.row_action a.button {margin:0;}
@@ -838,7 +886,7 @@
}
.top{
- padding: 0 10px;
+ padding: 1px 10px;
.border-radius( 5px,0, 0, 5px);
.dataTables_filter {
@@ -846,6 +894,7 @@
position: relative;
right: 0;
text-align: right;
+ margin-bottom: 5px;
}
.dataTables_length {
float: left;
@@ -863,9 +912,22 @@
.border-radius( 0, 5px, 5px, 0);
.TableTools {
- margin: 0;
+ 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;
+ }
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-31 17:43:33
|
Revision: 4542
http://oscss.svn.sourceforge.net/oscss/?rev=4542&view=rev
Author: oscim
Date: 2012-07-31 17:43:26 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
BO report prise en charge ajsutement listing et colonne visible ajout?\195?\169 via les sous modules
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/productsACA.php
trunk/catalog/admin/includes/modules/content/header_tags.php
trunk/catalog/admin/includes/modules/pages/products.php
trunk/catalog/admin/includes/modules/products/header_tags.php
Modified: trunk/catalog/admin/includes/classes/drivers/productsACA.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-07-30 21:36:56 UTC (rev 4541)
+++ trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-07-31 17:43:26 UTC (rev 4542)
@@ -81,7 +81,7 @@
public function __call($method, $attrs) {
$r=array();
foreach ($this->modules as $key=>$module) {
- if (( isset($attrs['flag']) && isset($module->$attrs['flag']) && (bool)$module->$attrs['flag']) /// control flag
+ 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);
Modified: trunk/catalog/admin/includes/modules/content/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/content/header_tags.php 2012-07-30 21:36:56 UTC (rev 4541)
+++ trunk/catalog/admin/includes/modules/content/header_tags.php 2012-07-31 17:43:26 UTC (rev 4542)
@@ -23,11 +23,11 @@
*/
public static $pInfo;
- var $code;
- var $title;
- var $description;
- var $sort_order;
- var $enabled;
+ public $code;
+ public $title;
+ public $description;
+ public $sort_order;
+ public $enabled;
/**
class constructor
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-07-30 21:36:56 UTC (rev 4541)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-07-31 17:43:26 UTC (rev 4542)
@@ -303,6 +303,16 @@
'alias'=>'available',
'text'=>__('products table heading available'),
);
+
+ /* 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;
+ }
+ }
+ /* END Sub module add col */
+
self::$allfields['p.products_status']= array(
'sort'=>true,
'alias'=>'status',
@@ -972,6 +982,15 @@
$query_raw .= " LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
}
+ /* DEB Sub module add table */
+ $r = self::$modules->__call('GetConf', array('languages_id'=>$languages_id, 'type'=>'tables')) ;
+ foreach($r as $mod=>$value){
+ foreach($value as $key=>$string){
+ $query_raw .= $string;
+ }
+ }
+ /* 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 ');
Modified: trunk/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/header_tags.php 2012-07-30 21:36:56 UTC (rev 4541)
+++ trunk/catalog/admin/includes/modules/products/header_tags.php 2012-07-31 17:43:26 UTC (rev 4542)
@@ -57,7 +57,55 @@
}
+
/**
+ @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();
+
+ switch ($opt['type']) {
+ case 'allfields':
+ $array['fhtd.head_title_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_title_tag',
+ 'text'=>__('@header_tags table heading title'),
+ 'width'=>'8%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ $array['fhtd.head_desc_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_desc_tag',
+ 'text'=>__('@header_tags table heading description'),
+ 'width'=>'14%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ $array['fhtd.head_keywords_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_keywords_tag',
+ 'text'=>__('@header_tags table heading tags'),
+ 'width'=>'10%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ break;
+
+ case 'tables':
+
+ $array['fht'] .= " LEFT JOIN " . TABLE_FULL_TAG . " fht ON( fht.page_id=p.products_id AND fht.page_type='product' ) ";
+ $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;
+ }
+
+ /**
Edition produit
UP db
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-30 21:37:03
|
Revision: 4541
http://oscss.svn.sourceforge.net/oscss/?rev=4541&view=rev
Author: oscim
Date: 2012-07-30 21:36:56 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Suite travail integration et refonte du template backoffice
normalisation et nettoyage html ds gabarit
correction element manquant dans les fichiers de langue
Modified Paths:
--------------
trunk/catalog/admin/includes/content/configuration.central.inc
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
trunk/catalog/admin/includes/gabarit/orders/filter.clause.gab
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
trunk/catalog/admin/includes/template/oscss/data/icon_set.xml
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/styles.less
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/content/configuration.central.inc
===================================================================
--- trunk/catalog/admin/includes/content/configuration.central.inc 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/content/configuration.central.inc 2012-07-30 21:36:56 UTC (rev 4541)
@@ -24,10 +24,12 @@
</div>
<h3 class="main-title"><?php echo tep_cst_menu_conf($cfg_group['configuration_group_title']); ?></h3>
+<div class="block_uniq">
<h4><?php echo tep_cst_menu_conf('TITLE_'.$cfg_group['configuration_group_title']); ?></h4>
<?php echo tep_draw_form('configuration', FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID . '&action=save_mutli') ?>
- <div class="box_left">
+ <div class="edit">
+<fieldset class="block_field">
<ul class="block_form tirroirs">
<?php foreach($list_edit as $row) { ?>
<li id="nav_<?php echo $row->key ?>"><h5 title="<?php echo '('.$row->key.' - ' . $row->set . ')'; ?>" class="Ctrtirroir"><?php echo __($row->title). tep_image(DIR_WS_ICONS . 'icon_help.gif'); ?></h5>
@@ -41,16 +43,15 @@
</li>
<?php } ?>
</ul>
- </div>
- <div class="box_right">
- <ul>
+
<div class="button_nav">
<?php print tep_image_submit('button_copy.gif', IMAGE_UPDATE) .tep_js_back(tep_href_link(FILENAME_CONFIGURATION, 'gparentID=' . $gparentID.'&gID=' . $gID )) ; ?>
</div>
- </li>
- </ul>
+</fieldset>
+<br class="clear" />
</div>
</form>
+ </div>
<?php endif; ?>
<!-- body_text_eof //-->
<!-- body_eof //-->
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.define_group.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -17,6 +17,8 @@
echo '<a class="button" href="' . tep_href_link(adminGroup::FILENAME) . '">' . IMAGE_CANCEL . '</a>';?>
</div>
<div class="box_uniq">
+
+ <div class="edit">
<table style="width:100%">
<thead>
<tr>
@@ -112,5 +114,6 @@
<?php } ?>
</tbody>
</table>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/adminGroup/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -14,6 +14,8 @@
<?php echo tep_draw_form('newsletter', adminGroup::FILENAME, 'gID='.@$_GET['gID'].'&action='. ((adminGroup::$action == 'edit')? 'group_edit' : 'new_confirm') , 'post' ); ?>
<div class="box_uniq">
+
+ <div class="edit">
<p><?php if (adminGroup::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', (int)$_GET['gID'] ); ?></p>
<fieldset class="block_field">
@@ -31,6 +33,7 @@
echo '<a class="button" href="' . tep_href_link(adminGroup::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
</div>
+ <br class="clear" />
</div>
-
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/adminUsers/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -19,8 +19,8 @@
<ul>
<li><a href="#tabs-1"><?php echo __('adminUsers tab specification'); ?></a></li>
</ul>
+ <div class="edit">
-
<div id="tabs-1" class="tabPage">
<?php echo tep_draw_form('adminUsers', adminUsers::FILENAME, 'action='.((adminUsers::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
@@ -65,5 +65,5 @@
<br class="clear" />
</div>
-
+ </div>
</div>
Modified: trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/attributes/display_view.options.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -11,7 +11,7 @@
?>
<h3><?php echo __('heading title') ?></h3>
<?php echo tep_draw_form('sort_detail', attributes::FILENAME, 'poID='.attributes::$poID.'&action='.((attributes::$action=='new')? 'insert':'update'), 'post') ?>
-
+<div class="edit">
<fieldset class="tabs_lang block_field">
<ul>
<?php for ($i=0, $n=sizeof(attributes::$languages); $i<$n; $i++) { ?>
@@ -62,4 +62,7 @@
<fieldset class="block_field button_nav">
<?php echo tep_image_submit('', IMAGE_UPDATE).tep_js_back(tep_href_link(attributes::FILENAME, tep_get_all_get_params(array('action','poID'))), IMAGE_CANCEL) ; ?>
</fieldset>
+
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/categories/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -19,70 +19,72 @@
<div class="box_uniq block_form">
<?php echo tep_draw_form('categories', categories::FILENAME, 'action='.((categories::$action == 'new')?'insert' : 'update').'&cPath=' . categories::$cPath, 'post', 'enctype="multipart/form-data"') ?>
- <div class="edit box_left w_70">
+
<div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
- <?php
- $g=3;
- categories::$modules->display_edit($contents,@$_GET['cID']);
- if(is_array($contents))
- foreach ($contents as $value) {
- if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
- $g++;
- } ?>
- </ul>
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
+ <?php
+ $g=3;
+ categories::$modules->display_edit($contents,@$_GET['cID']);
+ if(is_array($contents))
+ foreach ($contents as $value) {
+ if(!empty($value['title']))echo '<li><a href="#tabs-'.$g.'">'.$value['title'].'</a></li>'."\n";
+ $g++;
+ } ?>
+ </ul>
- <div id="tabs-1" class="tabPage">
+ <div class="edit box_left w_70">
-<!-- <p class="block_input"> -->
+ <div id="tabs-1" class="tabPage">
- <div class="tabs_lang">
- <ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image( categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+ <!-- <p class="block_input"> -->
- <?php } ?>
- </ul>
- <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
- <fieldset id="fieldset_<?php echo $i ?>">
- <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
- <p class="block_input" style="width:90%;">
- <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
- <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
- </p>
- <br style="clear:both" />
- <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
- <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
- </fieldset>
- <?php } ?>
- </div>
+ <div class="tabs_lang">
+ <ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <li><a href="#fieldset_<?php echo $i ?>"><?php echo tep_language_image( categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name']); ?></a></li>
+ <?php } ?>
+ </ul>
+ <?php for ($i=0, $n=sizeof(categories::$languages); $i<$n; $i++) { ?>
+ <fieldset id="fieldset_<?php echo $i ?>">
+ <legend><?php echo tep_image(DIR_WS_CATALOG_LANGUAGES . categories::$languages[$i]['directory'] . '/images/' . categories::$languages[$i]['image'], categories::$languages[$i]['name'], TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT); ?></legend>
+ <p class="block_input" style="width:90%;">
+ <label for="<?php echo 'content_title' . categories::$languages[$i]['id']; ?>"><?php echo __('text edit categories name'); ?></label>
+ <?php echo tep_draw_input_field('categories_name[' . categories::$languages[$i]['id'] . ']', '', categories::$cInfo->categories_name[categories::$languages[$i]['id']]) ; ?>
+ </p>
+ <br style="clear:both" />
+ <label for="<?php echo 'categories_description_' . categories::$languages[$i]['id'] . ''; ?>"><?php echo __('text edit categories description'); ?></label>
+ <?php echo $oscss->_call(BO_WISIWYG_SELECTED,'_draw','categories_description[' . categories::$languages[$i]['id'] . ']','1000','800',categories::$cInfo->categories_description[categories::$languages[$i]['id']]); ?>
+ </fieldset>
+ <?php } ?>
+ </div>
- <p class="block_input">
- <Label><?php echo __('text edit sort order') ?></label>
- <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
- <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+ <p class="block_input">
+ <Label><?php echo __('text edit sort order') ?></label>
+ <?php echo tep_draw_input_field('sort_order', '', categories::$cInfo->sort_order, 'size="2"') ?>
- </p>
+ <?php /** Hidden Inputs */ if(categories::$action == 'edit') echo tep_draw_hidden_field('categories_id', '', categories::$cInfo->categories_id); ?>
+ </p>
- <div class="block_input">
- <Label><?php echo __('text edit datatype categorie') ?></label>
- <ul>
- <?php foreach($DT->GetTypeForRootListing() as $k=>$row): ?>
- <li><?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , $row , (in_array($row, explode(',', categories::$cInfo->categories_datatype))? true : false) ) . ' '. $row ?></li>
- <?php endforeach; ?>
- <li><hr />
- <?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , 'NULL' , ((categories::$cInfo->categories_datatype == '')? true : false) ) . ' '. __('input datatype value none') ?></li>
- </ul>
- </div>
- </div>
+ <div class="block_input">
+ <Label><?php echo __('text edit datatype categorie') ?></label>
+ <ul>
+ <?php foreach($DT->GetTypeForRootListing() as $k=>$row): ?>
+ <li><?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , $row , (in_array($row, explode(',', categories::$cInfo->categories_datatype))? true : false) ) . ' '. $row ?></li>
+ <?php endforeach; ?>
+ <li><hr />
+ <?php echo tep_draw_radio_field('categories_datatype', 'categories_datatype' , 'NULL' , ((categories::$cInfo->categories_datatype == '')? true : false) ) . ' '. __('input datatype value none') ?></li>
+ </ul>
+ </div>
+ </div>
+
<?php
$g=3;
if(is_array($contents)){
Modified: trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/featureds/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -15,72 +15,72 @@
<?php echo tep_draw_form('featureds', featureds::FILENAME, 'action='.((featureds::$action == 'new')?'insert' : 'update&cID='.$_GET['cID']), 'post') ?>
<div id="tabs">
- <ul>
- <li><a href="#tabs-1"><?php echo __('@featureds tab specification'); ?></a></li>
- </ul>
+ <ul>
+ <li><a href="#tabs-1"><?php echo __('@featureds tab specification'); ?></a></li>
+ </ul>
+ <div class="edit">
+ <div id="tabs-1" class="tabPage">
- <div id="tabs-1" class="tabPage">
-
- <div class="tabs_lang">
- <ul>
+ <div class="tabs_lang">
+ <ul>
+ <?php foreach(tep_get_languages() as $lg): ?>
+ <li>
+ <a href="#fieldset_<?php echo $lg['id'] ?>">
+ <?php echo tep_language_image($lg['directory'] . '/images/' .$lg['image'], $lg['name']); ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
<?php foreach(tep_get_languages() as $lg): ?>
- <li>
- <a href="#fieldset_<?php echo $lg['id'] ?>">
- <?php echo tep_language_image($lg['directory'] . '/images/' .$lg['image'], $lg['name']); ?>
- </a>
- </li>
+ <fieldset id="fieldset_<?php echo $lg['id'] ?>" class="block_field">
+ <p class="block_input">
+ <label for="<?php echo 'title' . $lg['id']; ?>"><?php echo __('@featureds entry title'); ?></label>
+ <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], @featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
+ </p>
+ </fieldset>
<?php endforeach; ?>
- </ul>
- <?php foreach(tep_get_languages() as $lg): ?>
- <fieldset id="fieldset_<?php echo $lg['id'] ?>" class="block_field">
- <p class="block_input">
- <label for="<?php echo 'title' . $lg['id']; ?>"><?php echo __('@featureds entry title'); ?></label>
- <?php echo tep_draw_input_field('title[' . $lg['id'] . ']', 'title_' . $lg['id'], @featureds::$Info->lg[ $lg['id']]->title, 'size="70"', true) ; ?>
- </p>
- </fieldset>
- <?php endforeach; ?>
- </div>
+ </div>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds keys') ?></label>
- <?php echo tep_draw_input_field('featureds_key', '', @featureds::$Info->uniqkey) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds keys') ?></label>
+ <?php echo tep_draw_input_field('featureds_key', '', @featureds::$Info->uniqkey) ?>
+ </p>
- <p class="block_input">
- <label ><?php echo __('@featureds text info type'); ?></label>
- <?php echo tep_draw_pull_down_menu('featureds_type', tep_get_status_array('featured',0,'status_name'),featureds::$Info->type); ?>
- </p>
+ <p class="block_input">
+ <label ><?php echo __('@featureds text info type'); ?></label>
+ <?php echo tep_draw_pull_down_menu('featureds_type', tep_get_status_array('featured',0,'status_name'),featureds::$Info->type); ?>
+ </p>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds min') ?></label>
- <?php echo tep_draw_input_field('featureds_min', '', featureds::$Info->min) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds min') ?></label>
+ <?php echo tep_draw_input_field('featureds_min', '', featureds::$Info->min) ?>
+ </p>
- <p class="block_input">
- <Label><?php echo __('@featureds text info featureds max') ?></label>
- <?php echo tep_draw_input_field('featureds_max', '', featureds::$Info->max) ?>
- </p>
+ <p class="block_input">
+ <Label><?php echo __('@featureds text info featureds max') ?></label>
+ <?php echo tep_draw_input_field('featureds_max', '', featureds::$Info->max) ?>
+ </p>
-<!-- <p class="block_input">
- <Label><?php //echo __('text info featureds visible') ?></label>
- <?php //echo tep_draw_radio_field('featureds_visible', 'featureds_visible_1', '1', $featureds_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('featureds_visible', 'featureds_visible_0', '0', $featureds_visible_N) . ' ' . VISIBLE_NO ?>
- </p>-->
+ <!-- <p class="block_input">
+ <Label><?php //echo __('text info featureds visible') ?></label>
+ <?php //echo tep_draw_radio_field('featureds_visible', 'featureds_visible_1', '1', $featureds_visible_Y) . ' ' . VISIBLE_YES . ' ' . tep_draw_radio_field('featureds_visible', 'featureds_visible_0', '0', $featureds_visible_N) . ' ' . VISIBLE_NO ?>
+ </p>-->
- <p class="block_input button_nav">
- <?php
- echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
- echo tep_js_back(tep_href_link(featureds::FILENAME), IMAGE_CANCEL) ;
- ?>
- </p>
+ <p class="block_input button_nav">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) /*. tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' )*/;
+ echo tep_js_back(tep_href_link(featureds::FILENAME), IMAGE_CANCEL) ;
+ ?>
+ </p>
+ <br class="clear" />
+ </div>
</div>
-
- <br class="clear" />
</div>
</form>
</div>
Modified: trunk/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/navigation_links/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -22,7 +22,7 @@
<li><a href="#tabs-2"><?php echo __('@navigation_links tab other'); ?></a></li>
</ul>
-
+ <div class="edit">
<div id="tabs-1" class="tabPage">
@@ -95,5 +95,6 @@
<br class="clear" />
</div>
+ </div>
</form>
</div>
Modified: trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/newsletters/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -13,7 +13,7 @@
<h3><?php echo __('heading title '.((newsletters::$action == 'edit')?'edit' : 'new') ) ?></h3>
<?php echo tep_draw_form('newsletter', newsletters::FILENAME, 'action='.((newsletters::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
-
+<div class="edit">
<div class="box_left">
<div id="tabs">
<ul>
@@ -91,5 +91,6 @@
<?php if (newsletters::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newsletters::$nID); ?>
</div>
</div>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/newslettersModeles/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -13,6 +13,7 @@
<h3><?php echo __('heading title') ?></h3>
<?php echo tep_draw_form('newsletter', newslettersModeles::FILENAME, 'action='.((newslettersModeles::$action == 'edit')?'update' : 'insert') , 'post' ); ?>
+<div class="edit">
<div class="box_left">
<p><?php if (newslettersModeles::$action == 'edit') echo tep_draw_hidden_field('newsletter_id', '', newslettersModeles::$nID); ?></p>
<fieldset class="block_field">
@@ -48,5 +49,6 @@
echo '<a class="button" href="' . tep_href_link(newslettersModeles::FILENAME) . '">' . IMAGE_CANCEL . '</a>'; ?>
</div>
</div>
-
+ <br class="clear" />
+ </div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/gabarit/orders/filter.clause.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/orders/filter.clause.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/orders/filter.clause.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -13,15 +13,15 @@
<legend><?php echo __('@orders filter legend choose dates'); ?></legend>
<ul class="inline">
<li class="inline">
- <label for="filters[dates][start]"><?php echo __('@orders text products date start'); ?></label>
+ <label for="filters[dates][start]"><?php echo __('@orders text date start'); ?></label>
<?php echo tep_draw_input_field('filters[dates][start]', 'filters_start', tep_date_short( @$_SESSION['filters']['dates']['start'] ), ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_filters_start'); ?>
</li>
<li class="inline">
- <label for="filters[dates][end]"><?php echo __('@orders text products date end'); ?></label>
+ <label for="filters[dates][end]"><?php echo __('@orders text date end'); ?></label>
<?php echo tep_draw_input_field('filters[dates][end]', 'filters_end', tep_date_short( @$_SESSION['filters']['dates']['end'] ), ' maxlength="10" size="10"') . tep_draw_hidden_field('bt_filters_end'); ?>
</li>
<li class="inline">
- <?php echo ' ' . __('text products date format'); ?>
+ <?php echo ' ' . __('@orders text date format'); ?>
</li>
</ul>
</fieldset>
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-07-30 21:36:56 UTC (rev 4541)
@@ -15,7 +15,7 @@
<?php echo tep_draw_form('new_product', products::FILENAME, 'pID='.$_GET['pID'].'&action=update_product', 'post', 'enctype="multipart/form-data"'); ?>
<div class="block_form">
- <div class="edit box_left w_70">
+
<div id="tabs">
<ul>
<li><a href="#tabs-1"><?php echo __('tab products data'); ?></a></li>
@@ -29,6 +29,7 @@
} ?>
</ul>
+ <div class="edit box_left w_70">
<div id="tabs-1" class="tabPage">
<fieldset class="tabs_lang block_field">
@@ -207,43 +208,44 @@
<div class="edit box_right fright w_30">
<fieldset class="block_field">
- <legend><?php echo __('text legend image'); ?></legend>
- <dl>
- <dt class="block_input">
- <p class="new_product_img" ><?php echo tep_info_image(products::$Info->products_image, products::$Info->products_image, TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT, 'class="new_product_img" id="products_imageimg"'); ?></p>
- </dt>
- <?php if(products::CheckClassProduct('CLASS_IMAGE')): /** Si image de prix defini, les prix sont pris en charge par un onglet */ ?>
- <dt class="block_input">
- <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'return false;">'.tep_draw_input_field('products_image','', products::$Info->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
- </dt>
- <?php endif; ?>
- </dl>
+ <legend><?php echo __('text legend image'); ?></legend>
+ <dl>
+ <dt class="block_input">
+ <p class="new_product_img" ><?php echo tep_info_image(products::$Info->products_image, products::$Info->products_image, TEMP_BO_HEADING_IMAGE_WIDTH, TEMP_BO_HEADING_IMAGE_HEIGHT, 'class="new_product_img" id="products_imageimg"'); ?></p>
+ </dt>
+ <?php if(products::CheckClassProduct('CLASS_IMAGE')): /** Si image de prix defini, les prix sont pris en charge par un onglet */ ?>
+ <dt class="block_input">
+ <?php echo '<a class="button browser" href="#" onclick="'.tep_get_filebroswerserveur("products_image", "image", '').'return false;">'.tep_draw_input_field('products_image','', products::$Info->products_image ).' '.tep_image(DIR_WS_ICONS . 'icon_browser.png', PARCOURIR_SERVER) .'</a>'; ?>
+ </dt>
+ <?php endif; ?>
+ </dl>
</fieldset>
<fieldset class="block_field">
- <dl>
- <dd class="block_input">
- <label><?php echo __('text products status'); ?></label>
- <?php echo tep_draw_radio_field('products_status', 'products_status_1', '1', products::$in_status,'','class="radio"') . __('text product available') . tep_draw_radio_field('products_status', 'products_status_0', '0', products::$out_status,'','class="radio"') . __('text product not available'); ?>
- </dd>
+ <dl>
+ <dd class="block_input">
+ <label><?php echo __('text products status'); ?></label>
+ <?php echo tep_draw_radio_field('products_status', 'products_status_1', '1', products::$in_status,'','class="radio"') . __('text product available') . tep_draw_radio_field('products_status', 'products_status_0', '0', products::$out_status,'','class="radio"') . __('text product not available'); ?>
+ </dd>
- <!-- All LinkTo -->
- <?php foreach(MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
- <dt class="block_input w_90">
- <?php echo $row['text'] ;?>
- </dt>
- <?php endforeach;?>
+ <!-- All LinkTo -->
+ <?php foreach(MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
+ <dt class="block_input w_90">
+ <?php echo $row['text'] ;?>
+ </dt>
+ <?php endforeach;?>
- <dd class="block_input button_nav" style="width:95%;">
- <?php
- echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
- echo tep_js_back(tep_href_link(products::FILENAME, (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : '')), IMAGE_CANCEL) ;
- ?>
- </dd>
- </dl>
- </fieldset>
+ <dd class="block_input button_nav" style="width:95%;">
+ <?php
+ echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );
+ echo tep_js_back(tep_href_link(products::FILENAME, (isset($_GET['pID']) ? '&pID=' . $_GET['pID'] : '')), IMAGE_CANCEL) ;
+ ?>
+ </dd>
+ </dl>
+ </fieldset>
</div>
+
<div class="separator"></div>
</div>
</form>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cronjob.txt 2012-07-30 21:36:56 UTC (rev 4541)
@@ -29,6 +29,7 @@
/* Edit */
$lang['definir le module utilise']="Module utilisé" ;
+ $lang['module txt name']="Choix du module à utiliser" ;
$lang['definir le delai de repetition']="Délais de répétition" ;
$lang['definir la date de premiere execution']="Date de premiere execution" ;
$lang["definir si l'execution est unique"]="Repetition" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/featureds.txt 2012-07-30 21:36:56 UTC (rev 4541)
@@ -13,6 +13,7 @@
/* Listing */
$lang['heading title featureds'] = "Mise en avant" ;
+
$lang['@featureds table heading id'] = "Id" ;
$lang['@featureds table heading datatype id'] = "Id." ;
$lang['@featureds table heading min'] = "Min." ;
@@ -33,6 +34,8 @@
/* Edit / add */
+ $lang['heading title edit'] = "Edition" ;
+
$lang['@featureds tab specification'] = "Caractéristique" ;
$lang['@featureds entry title'] = "Titre" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/index.txt 2012-07-30 21:36:56 UTC (rev 4541)
@@ -23,6 +23,7 @@
$lang['heading title admin']="Tableau de bord des utilisateurs et groupes privés" ;
$lang['heading title services']="Tableau de bord des services" ;
$lang['heading title shipping']="Tableau de bord des expeditions" ;
+$lang['heading title system']="Systeme " ;
$lang['heading title config_100']="Configuration de l'apparence" ;
$lang['heading title config_110']="Configuration de base" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/orders.txt 2012-07-30 21:36:56 UTC (rev 4541)
@@ -23,8 +23,9 @@
$lang['@orders filter legend choose status']="Statut visible" ;
$lang['@orders filter legend choose dates']="Periode" ;
- $lang['@orders text products date start']="Début" ;
- $lang['@orders text products date end']="Fin" ;
+ $lang['@orders text date start']="Début" ;
+ $lang['@orders text date end']="Fin" ;
+ $lang['@orders text date format']="Format (jj/mm/aaaa)" ;
/* Fields */
$lang['orders table heading order id']="n°" ;
Modified: trunk/catalog/admin/includes/template/oscss/data/icon_set.xml
===================================================================
--- trunk/catalog/admin/includes/template/oscss/data/icon_set.xml 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/template/oscss/data/icon_set.xml 2012-07-30 21:36:56 UTC (rev 4541)
@@ -139,14 +139,14 @@
<format>
<row_action>
<![CDATA[<div class="row_action">
- <span class="view fils fleft"> %s </span>
- <span class="view fils fright "> %s </span>
+ <span class="view fils fright"> %s </span>
+ <span class="view fils fleft"> %s </span>
</div>]]>
</row_action>
<row_status>
<![CDATA[<div class="row_action">
- <span class="view fils fleft"> %s </span>
- <span class="view fils fright "> %s </span>
+ <span class="view fils fright"> %s </span>
+ <span class="view fils fleft"> %s </span>
</div>]]>
</row_status>
<row_etat>
Modified: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-30 21:36:56 UTC (rev 4541)
@@ -37,7 +37,7 @@
<script type="text/javascript" charset="utf-8">
$(function(){
- $("input[type=text],input[type=radio],input[type=checkbox], textarea").uniform();
+ $("input[type=text],input[type=checkbox], textarea").uniform();
});
</script>
</head>
@@ -45,7 +45,7 @@
<div id="glob">
<div id="center">
<!-- header //-->
- <header>
+ <header id="header">
<?php if (($header=tep_test_gab_ele('header')) !=false) require($header); ?>
<nav>
@@ -123,5 +123,5 @@
<!-- footer //-->
<footer>
<?php require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'footer.php'); ?>
- <footer>
+ </footer>
<!-- footer_eof //-->
Modified: trunk/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/styles.less 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/template/oscss/styles.less 2012-07-30 21:36:56 UTC (rev 4541)
@@ -91,7 +91,14 @@
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 { font-size: 20px; font-weight: bold; text-shadow:0 1px 0 #fff;color:#666;}
+ 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;}
@@ -151,7 +158,8 @@
height:16px;
}
.Ctrtirroir.closed {background:transparent url('../../../images/icons/icon_arrow_right.gif') left top no-repeat; }
- ul.tirroir li { float: left; position: relative; width: 100%;}
+ fieldset ul.tirroir li { float: left; position: relative; width: 100%;}
+
@@ -161,11 +169,11 @@
-
body {
background:#faf9f7 url("img/1/body.jpg") left -80px repeat-x;
+ background-attachment:fixed;
// color:#000;
margin:0;
padding:0;
@@ -355,10 +363,34 @@
* 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 {
- background:transparent url(img/1/black.jpg) repeat-x ;
width:100%;
- background-attachment:fixed;
z-index:10;
height:100%;
@@ -371,12 +403,29 @@
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:0;
+ top:79px;
+ margin-bottom: 79px;
border-left: 1px solid black;
border-right: 1px solid black;
border-bottom: 1px solid black;
@@ -394,28 +443,13 @@
div.box_right {
width:39%;
float:right;
- background:#f1f1f1;
- background-color: #ffffff;
+// background:#f1f1f1;
+// background-color: #ffffff;
}
h4{font-weight:bold; padding:15px 5px 8px; clear:both; }
}
-// .page {
-// div#central{
-// }
-// }
-
- .configuration{
- div#central{
- div.box_right {
- right:0;
- width:39%;
-
- ul{ list-style:none; }
- }
- }
- }
}
div#center,
@@ -616,12 +650,43 @@
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
*/
@@ -681,22 +746,6 @@
font-size: 10px;
cursor:default;
- .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;
- }
-
-
/* Replace value by icon */
.edit-input-value .Val.img { display: block; height: 16px; margin: auto; width: 16px;}
@@ -710,7 +759,20 @@
.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 {
color : @color_sorting_text;
background-color: @color_sorting;
@@ -927,41 +989,47 @@
textarea{ vertical-align:baseline;}
p{
- .new_product_img {
- float:left;
- padding:5px;
- margin : 0 auto;
- text-align:center;
- width:98%;
-
- img{
- -moz-border-radius:6px; -webkit-border-radius: 6px;
- border:1px solid #ACAAAC;
- margin:1px;
- max-width: 400px;
- }
+ img{
+ border:1px solid #ACAAAC;
+ .border-radius(5px,5px,5px,5px);
+ max-width: 300px;
}
+
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);
+ .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%;
+ }
+
ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
.block_form {
.block_input{
text-shadow:0 1px 0 #fff;
- width:98.9%;
+ width:94.9%;
margin:2px 1px;
display:inline-block;
text-align: left;
@@ -969,8 +1037,10 @@
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%;}
@@ -984,15 +1054,22 @@
span.value_edit span.edit-input{float:left; display:inline-block; padding:0 12px;}
span.edit-input{
- .edit-input-value-alternate {float:left; display:inline-block; padding:0 12px;width:25px; height: 25px;}
+ 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.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;}
}
@@ -1003,11 +1080,11 @@
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));
+// 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{
@@ -1182,7 +1259,7 @@
}
.ui-widget-content {
- background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+// background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
color: #222222;
}
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-29 19:46:15 UTC (rev 4540)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-30 21:36:56 UTC (rev 4541)
@@ -11,29 +11,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;}
-/* sous menu en widget , specifique page conf et dashboard configuration */
-#central #SsMenuConfig #ssmenu {background:none;}
-#SsMenuConfig #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%;}
-#SsMenuConfig #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);}
-/* Habillage */
-/* header */
-#headInfos {display:inline-block; height:25px; margin:0; padding:0;width:100%; color:white;}
-#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,
-#headInfos span{padding-right:1em; color:white; text-decoration:none; line-height:25px; vertical-align:top;float:right;}
-#headInfos a:hover{text-decoration:underline;}
-/* #menubar{ background:transparent ; height:25px; border-top: 1px solid #fff;} */
#menubar li.account {padding-right:8px;}
/* Bookmark */
@@ -42,11 +27,6 @@
-
-
-
-
-
/* 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}
@@ -128,17 +108,6 @@
-
-
-
-/* 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;}
-
-
-
/* MEnu ADmin Habillage icone */
a.menuBoxContentLink{ background: transparent url(img/1/config.png) 0px 2px no-repeat; text-decoration:none;text-shadow: 0 1px 0 #ae0405;margin-left:1em;}
a.menuBoxContentLink.configuration { background-image: url(img/1/config.png); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-29 19:46:22
|
Revision: 4540
http://oscss.svn.sourceforge.net/oscss/?rev=4540&view=rev
Author: oscim
Date: 2012-07-29 19:46:15 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Suite travail sur le template BO oscss
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/styles.less
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
Modified: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-29 15:19:35 UTC (rev 4539)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-29 19:46:15 UTC (rev 4540)
@@ -37,7 +37,7 @@
<script type="text/javascript" charset="utf-8">
$(function(){
- $("input[type=text],input[type=radio],input[type=checkbox], select, textarea").uniform();
+ $("input[type=text],input[type=radio],input[type=checkbox], textarea").uniform();
});
</script>
</head>
Modified: trunk/catalog/admin/includes/template/oscss/styles.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/styles.less 2012-07-29 15:19:35 UTC (rev 4539)
+++ trunk/catalog/admin/includes/template/oscss/styles.less 2012-07-29 19:46:15 UTC (rev 4540)
@@ -26,6 +26,19 @@
// widget
@color_widget_1 : #78222F; // title and th
+
+ @bg_hover : #E6FF99; // hover row or filter
+
+
+ @bg_table_tr_odd : #F0F0F0;
+ @bg_table_tr_even : #D7D7D7;
+ @color_sorting : #E6FF99; // cols sorting
+ @color_sorting_text : black;
+
+ @color_split : #78222F;
+ @color_split_active : #78222F;
+ @color_split_active_text : white;
+
/* Mixin */
@import "element.less";
@@ -284,10 +297,16 @@
color:white;
select {
- margin:0;
+ 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:black;font-size:0.9em; }
}
@@ -467,12 +486,12 @@
border:1px solid #fff;
height: 25px;
line-height: 25px;
- -moz-border-radius:5px;
- -webkit-border-radius: 5px;
- -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
- -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
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;
@@ -557,6 +576,7 @@
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;
@@ -632,7 +652,7 @@
margin:0;
th{
- background-color: #303030;
+ background-color: @color_widget_1;
font-size:1em;
font-weight:bold;
text-align:center;
@@ -650,7 +670,7 @@
cursor:default;
&:hover{
- background-color: #E6FF99;
+ background-color: @bg_hover;
cursor: pointer;
}
@@ -690,21 +710,102 @@
.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}
}
+
+ .sorting_1 {
+ color : @color_sorting_text;
+ background-color: @color_sorting;
+ }
+
+ .sorting_2 {
+ color : @color_sorting_text;
+ background-color:( @color_sorting + 25);
+ }
+
+ .sorting_3 {
+ color : @color_sorting_text;
+ background-color:( @color_sorting + 50);
+ }
+
+ .sorting_4 {
+ color : @color_sorting_text;
+ background-color:( @color_sorting + 75);
+ }
+
+ .sorting_5 {
+ color : @color_sorting_text;
+ background-color:( @color_sorting + 100);
+ }
+
+ .sorting_6 {
+ color : @color_sorting_text;
+ background-color:( @color_sorting + 125);
+ }
}
+
+ .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 .top,
- .dataTables_wrapper .bottom {
- padding: 5px 10px;
+
+ .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: 0 10px;
+ .border-radius( 5px,0, 0, 5px);
+
+ .dataTables_filter {
+ clear: both;
+ position: relative;
+ right: 0;
+ text-align: right;
+ }
+ .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;
+ padding:0;
+ }
+ }
}
- .dataTables_wrapper .bottom .TableTools {
- margin: 0;
- padding:0;
- }
- .dataTables_wrapper {min-height:200px}
/**
* class qui rend element enfant visible au survol de l'element parent
@@ -721,22 +822,28 @@
/**
* Listing Filter for Datatable
*/
- form#filters {
- padding:0 1em;
+ 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 25px;
+ padding: 2px 10px 2px 20px;
font-size:1.2;
width:95.2%;
- background-color: #F5F5F5;
- border-color: #CCCCCC #CCCCCC -moz-use-text-color;
- border-style: solid solid none;
- border-width: 1px 1px medium;
+
+// 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: #E6FF99;
+ background-color: @bg_hover;
cursor:pointer;
}
}
@@ -744,6 +851,7 @@
div#filtre {
padding:0;
border:1px solid #AAAAAA;
+ background: transparent;
ul.ui-tabs-nav {
width:99.6%;
@@ -838,7 +946,14 @@
input[type="checkbox"] { float:right; }
select,
- input[type="text"] { margin:5px 15px; min-width:200px; }
+ input[type="text"] {
+ margin:5px 15px;
+ min-width:200px;
+ border:1px solid #D7D7D7;
+ .border-radius(5px);
+ .rounded(5px);
+ .bw-gradient( #E4E4E4, 200, 255) ;
+ }
}
ul.ui-tabs-nav {display: inline-block; margin: 0 ; padding: 1px; width: 99%;}
@@ -881,7 +996,7 @@
.tabs_lang{width:98.5%; float:left;}
}
- .block_field {
+ .block_field {
text-shadow:0 1px 0 #fff;
width:98.9%; margin:2px ;
display:inline-block;
@@ -891,6 +1006,8 @@
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{
@@ -925,8 +1042,59 @@
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
*/
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-29 15:19:35 UTC (rev 4539)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-29 19:46:15 UTC (rev 4540)
@@ -43,15 +43,10 @@
-/* Select Categorie */
-#CurrentPathSelect *,
-#CurrentPathSelect form {margin:0; padding:0; width:100%;}
-#CurrentPathSelect form #cPath { margin:0; font-size:18px; color:black; font-weight:bold; border:none; border-width:6px; border:1px solid #CCCCCC; border-bottom:none; padding:0.2em 0.6em; background-color:#f5f5f5; }
-#CurrentPathSelect form #cPath option {background-color:#f5f5f5;}
-#CurrentPathSelect form #cPath:hover {background-color: #E6FF99;cursor:pointer; }
+
/* 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}
@@ -60,26 +55,6 @@
/* Specifique page diverse */
-/* Ajsutement customer page */
-#central .box_uniq.block_form.main-customers .block_input label{width:35%;}
-
-
-/* Ajsutement Page Orders*/
-#central .box_uniq.block_form.main-orders fieldset{margin:10px 0 0 0;padding:0 5px;}
-
-#central div.main-orders.block {background:#c9c9c9; -moz-border-radius: 6px 6px 6px 6px;}
-
-#central .block_form.main-orders .block_input br,
-#central .block_form.main-orders .block_input span.value_edit br{display:block;height:0;}
-
-#central table.main-orders {width:100%;}
-#central table.main-orders thead tr th{background:#303030; color:white;font-weight: normal; text-shadow: none;}
-#central table.main-orders tr th{background:#eee; height:20px;line-height: 20px; }
-#central table.main-orders tr th a{margin:0;}
-
-
-
-
/* 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; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-29 15:19:44
|
Revision: 4539
http://oscss.svn.sourceforge.net/oscss/?rev=4539&view=rev
Author: oscim
Date: 2012-07-29 15:19:35 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Refonte du css du backoffice pour le template oscss; et mise en oeuvre de less pour simplifier mise en oeuvre, suivi et modification.
correction appel obsolete sur la page redirect
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/redirect.php
Added Paths:
-----------
trunk/catalog/admin/includes/javascript/less-1.3.0.min.js
trunk/catalog/admin/includes/template/oscss/element.less
trunk/catalog/admin/includes/template/oscss/styles.less
Added: trunk/catalog/admin/includes/javascript/less-1.3.0.min.js
===================================================================
--- trunk/catalog/admin/includes/javascript/less-1.3.0.min.js (rev 0)
+++ trunk/catalog/admin/includes/javascript/less-1.3.0.min.js 2012-07-29 15:19:35 UTC (rev 4539)
@@ -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
Added: trunk/catalog/admin/includes/template/oscss/element.less
===================================================================
--- trunk/catalog/admin/includes/template/oscss/element.less (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/element.less 2012-07-29 15:19:35 UTC (rev 4539)
@@ -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: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-29 14:46:31 UTC (rev 4538)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-29 15:19:35 UTC (rev 4539)
@@ -19,6 +19,8 @@
<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 ?>" />
+
+<link rel="stylesheet/less" type="text/css" href="<?php echo DIR_WS_TEMPLATE ?>styles.less">
<?php
/** Appel des css */
if (($stylesheet=tep_test_gab_ele('stylesheet','css')) !=false) tep_include_file ($stylesheet,true);
@@ -29,6 +31,8 @@
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">
@@ -41,23 +45,24 @@
<div id="glob">
<div id="center">
<!-- header //-->
- <div id="header">
+ <header>
<?php if (($header=tep_test_gab_ele('header')) !=false) require($header); ?>
- <!-- menubar //-->
- <?php
- $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>
+ <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>
- <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>
- </div>
+ <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>
<!-- menubar_eof //-->
@@ -83,7 +88,7 @@
</li>
</ul>-->
</div>
- </div>
+ </header>
<!-- header_eof //-->
<!-- central //-->
@@ -116,7 +121,7 @@
</div>
<!-- footer_gabarit_eof //-->
<!-- footer //-->
- <div id="footer">
+ <footer>
<?php require(DIR_FS_ADMIN.DIR_WS_INCLUDES . 'footer.php'); ?>
- </div>
+ <footer>
<!-- footer_eof //-->
Modified: trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2012-07-29 14:46:31 UTC (rev 4538)
+++ trunk/catalog/admin/includes/template/oscss/jquery-ui-1.css 2012-07-29 15:19:35 UTC (rev 4539)
@@ -10,13 +10,13 @@
/* Layout helpers
----------------------------------*/
-.ui-helper-hidden { display: none; }
+/*.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:before, .ui-helper-clearfix:after { content: ""; display: table; }
.ui-helper-clearfix:after { clear: both; }
.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }*/
/* Interaction Cues
@@ -53,23 +53,23 @@
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+/*.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(img/1/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
.ui-widget-content a { color: #222222; }
.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(img/1/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
+.ui-widget-header a { color: #222222; }*/
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(img/1/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+/*.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(img/1/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; 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 { border: 1px solid #999999; background: #dadada url(img/1/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
.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: #212121; }
.ui-stat...
[truncated message content] |
|
From: <os...@us...> - 2012-07-29 14:46:37
|
Revision: 4538
http://oscss.svn.sourceforge.net/oscss/?rev=4538&view=rev
Author: oscim
Date: 2012-07-29 14:46:31 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
suppression reliquat
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-07-29 14:15:08 UTC (rev 4537)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.edit.gab 2012-07-29 14:46:31 UTC (rev 4538)
@@ -77,12 +77,12 @@
<fieldset class="block_field">
<dl>
- <dt class="block_input w_90">
+ <dt class="block_input">
<label for="content_name" title="<?php echo __('entry content help'); ?>"><?php echo __('entry content').tep_image(DIR_WS_ICONS .'icon_help.gif') ?></label>
<?php echo tep_draw_input_field('content_name', '', cms_content::$Info->name) . tep_draw_hidden_field('p_format','','HTML'); ?>
</dt>
- <dt class="block_input w_90">
+ <dt class="block_input">
<label><?php echo __('text content status'); ?></label>
<?php echo tep_draw_radio_field('content_status', 'content_status_1', '1', cms_content::$enabled_status) . __('text content enabled') . tep_draw_radio_field('content_status', 'content_status_0', '0', cms_content::$disabled_status) . __('text content disabled'); ?>
</dt>
@@ -90,13 +90,13 @@
<!-- All LinkTo -->
<?php foreach(MLinkTo::LoadRightTo( 'content', 'edit' , 'action='.cms_content::$action.'&cID='.@$_GET['cID'] ) as $row): ?>
- <dt class="block_input w_90">
+ <dt class="block_input">
<?php echo $row['text'] ;?>
</dt>
<?php endforeach;?>
- <dt class="block_input button_nav w_90" >
+ <dt class="block_input button_nav" >
<?php echo tep_image_submit('', IMAGE_UPDATE) . tep_image_submit('', IMAGE_UPDATE_AND_CLOSE,' name="up_and_close"' );?>
<?php echo tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$Info->id), IMAGE_CANCEL); ?>
</dt>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-29 14:15:15
|
Revision: 4537
http://oscss.svn.sourceforge.net/oscss/?rev=4537&view=rev
Author: oscim
Date: 2012-07-29 14:15:08 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
report class select sur les checkbox actif
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab 2012-07-29 09:11:22 UTC (rev 4536)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.categorie.gab 2012-07-29 14:15:08 UTC (rev 4537)
@@ -22,7 +22,7 @@
<legend><?php echo __('@filters filter legend choose categorie'); ?></legend>
<ul >
<?php foreach(categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$languages_id , 'exclude'=>array('0'))) as $k=>$item): ?>
- <li>
+ <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')); ?>
<?php echo (is_array($item)? $item['text'] : $item ) ?>
</li>
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-07-29 09:11:22 UTC (rev 4536)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.featured.gab 2012-07-29 14:15:08 UTC (rev 4537)
@@ -23,7 +23,7 @@
<fieldset>
<legend><?php echo __('@filters filter legend choose featured'); ?></legend>
- <ul >
+ <ul class="<?php echo ((bool)((string)$_SESSION['filters']['featured'][$item->id] == 'on')? 'select' : '' ) ?>">
<?php foreach($list as $k=>$item): ?>
<li>
<?php echo tep_draw_checkbox_field('filters[featured]['.$item->id.']', 'filters[featured]['.$item->id.']', 'on', (bool) ((string)$_SESSION['filters']['featured'][$item->id] == 'on')); ?>
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab 2012-07-29 09:11:22 UTC (rev 4536)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.listfield.gab 2012-07-29 14:15:08 UTC (rev 4537)
@@ -15,7 +15,7 @@
<ul class="inline">
<?php foreach(MGabCont::CallSt('DFilterAllfields') as $k=>$item):
$clean = substr($k, (strpos($k, '.')+1)); ?>
- <li>
+ <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')); ?>
<?php echo (is_array($item)? $item['text'] : $item ) ?>
</li>
Modified: trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-07-29 09:11:22 UTC (rev 4536)
+++ trunk/catalog/admin/includes/gabarit/MGabCont/filter.subtype.gab 2012-07-29 14:15:08 UTC (rev 4537)
@@ -14,7 +14,7 @@
<legend><?php echo __('@filters filter legend choose subtype'); ?></legend>
<ul class="inline">
<?php foreach(tep_get_status_array(MGabCont::CallSt('GetClassDatatype')) as $item): ?>
- <li>
+ <li class="<?php echo ((bool)(count(@$_SESSION['filters']['subtype']) <1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')? 'select' : '' ) ?>" >
<?php echo tep_draw_checkbox_field('filters[subtype]['.$item['id'] .']', 'filters[subtype]['.$item['id'].']', 'on', (bool)(count(@$_SESSION['filters']['subtype']) <1 || (string)@$_SESSION['filters']['subtype'][$item['id']] == 'on')); ?>
<?php echo $item['text'] ?>
</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-29 09:11:28
|
Revision: 4536
http://oscss.svn.sourceforge.net/oscss/?rev=4536&view=rev
Author: oscim
Date: 2012-07-29 09:11:22 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
add link to pages
Modified Paths:
--------------
trunk/catalog/admin/includes/widget/CustomerLast.php
trunk/catalog/admin/includes/widget/orderLast.php
Modified: trunk/catalog/admin/includes/widget/CustomerLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/CustomerLast.php 2012-07-28 09:20:15 UTC (rev 4535)
+++ trunk/catalog/admin/includes/widget/CustomerLast.php 2012-07-29 09:11:22 UTC (rev 4536)
@@ -31,7 +31,7 @@
?>
<div id="CustomerLast" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('CustomerLast heading'); ?></h3>
+<h3><a href="<?php echo tep_href_link(FILENAME_CUSTOMERS); ?>"><?php echo __('CustomerLast heading'); ?></a></h3>
<div id="tabs">
<ul>
Modified: trunk/catalog/admin/includes/widget/orderLast.php
===================================================================
--- trunk/catalog/admin/includes/widget/orderLast.php 2012-07-28 09:20:15 UTC (rev 4535)
+++ trunk/catalog/admin/includes/widget/orderLast.php 2012-07-29 09:11:22 UTC (rev 4536)
@@ -25,7 +25,7 @@
$datadocs=new DatasFiles;
?>
<div id="orderLast" class="<?php echo $widg['class'] ?>">
-<h3><?php echo __('orderLast box title'); ?></h3>
+<h3><a href="<?php echo tep_href_link(FILENAME_ORDERS); ?>"><?php echo __('orderLast box title'); ?></a></h3>
<div id="tabs">
<ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-28 09:20:21
|
Revision: 4535
http://oscss.svn.sourceforge.net/oscss/?rev=4535&view=rev
Author: oscim
Date: 2012-07-28 09:20:15 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php
Modified: branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php
===================================================================
--- branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php 2012-07-25 06:30:52 UTC (rev 4534)
+++ branches/2.1.1/catalog/common/classes/datatype_drivers/Data_product.php 2012-07-28 09:20:15 UTC (rev 4535)
@@ -404,7 +404,7 @@
if($row['epf_uses_value_list'] == 0)
$tmp .= " OR ( p2pef.products_extra_fields_id = '".$row['epf_id']."' AND p2pef.products_extra_fields_value like '%" . tep_db_input($keyword) . "%' ) ";
else
- $tmp .= " OR ( pefv.epf_id = '".$row['epf_id']."' AND pefv.epf_value like '%" . tep_db_input($keyword) . "%' ) ";
+ $tmp .= " OR ( pefv.value_id= p2pef.products_extra_fields_value AND pefv.epf_id = '".$row['epf_id']."' AND pefv.epf_value like '%" . tep_db_input($keyword) . "%' ) ";
}
$this->listing_sql['where'] .= " OR ( " . substr($tmp, 3) . " ) ";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-25 06:30:58
|
Revision: 4534
http://oscss.svn.sourceforge.net/oscss/?rev=4534&view=rev
Author: oscim
Date: 2012-07-25 06:30:52 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
correction lors de l'ajout d'une zone geo_zone
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php
Modified: branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab
===================================================================
--- branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab 2012-07-24 16:13:09 UTC (rev 4533)
+++ branches/2.1.1/catalog/admin/includes/gabarit/geo_zones/display_view.listing.gab 2012-07-25 06:30:52 UTC (rev 4534)
@@ -12,7 +12,7 @@
<div class="button_nav">
- <?php if (!geo_zones::$action) echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES, tep_get_all_get_params(array('action','sID')). '&action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
+ <?php if (geo_zones::$action =='listing') echo '<a class="button" href="' . tep_href_link(FILENAME_GEO_ZONES, tep_get_all_get_params(array('action','sID')). '&action=new_zone') . '">' .tep_image(DIR_WS_ICONS . 'icon_add_new.png', IMAGE_ICON_INFO).' '. __('image insert new zone') . '</a>'; ?>
</div>
<div class="box_uniq">
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php 2012-07-24 16:13:09 UTC (rev 4533)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/geo_zones.php 2012-07-25 06:30:52 UTC (rev 4534)
@@ -74,7 +74,7 @@
@brief initialise class
*/
private static function init(){
- self::$action = (isset($_GET['action']) ? $_GET['action'] : '');
+ self::$action = (isset($_GET['action']) ? $_GET['action'] : 'listing');
self::$saction = (isset($_GET['saction']) ? $_GET['saction'] : '');
self::$getzID = (isset($_GET['zID']) ? $_GET['zID'] : '1');
self::$getsID = (isset($_GET['sID']) ? $_GET['sID'] : '');
@@ -84,7 +84,7 @@
// if(!self::$is_zone && self::$action =='edit')
//! active datatable in ajax, precise les GET necessaire
- if(!defined('JSONSTATMENT'))
+ if(!defined('JSONSTATMENT') && self::$action !='new_zone')
if(self::$is_zone && self::$action =='edit')
define('JSONSTATMENT', 'mod=page&type='.self::$code.(isset($_GET['zID']) ? '&zID='.$_GET['zID'] : '').'&saction=list');
else
@@ -481,7 +481,7 @@
self:: $zInfo=self::load_db_values(self::$getzID);
self:: $zInfo->modeleszones=self::GetZoneModele();
- $action ='new';
+ $action ='edit';
break;
case 'edit':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-24 16:13:20
|
Revision: 4533
http://oscss.svn.sourceforge.net/oscss/?rev=4533&view=rev
Author: oscim
Date: 2012-07-24 16:13:09 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
coquille appel MLinkTo::LoadRightTo
correction appel des sous type de dataytype
Modified Paths:
--------------
trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
trunk/catalog/admin/includes/modules/pages/cms_content.php
trunk/catalog/admin/includes/modules/pages/products.php
Modified: trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-07-23 07:31:00 UTC (rev 4532)
+++ trunk/catalog/admin/includes/gabarit/products/display_view.edit.gab 2012-07-24 16:13:09 UTC (rev 4533)
@@ -229,7 +229,7 @@
<!-- All LinkTo -->
- <?php foreach(MLinkTo::LoadRightTo( 'products', 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
+ <?php foreach(MLinkTo::LoadRightTo(products::$datatype, 'edit' , 'action='.products::$action.'&pID='.@$_GET['pID'] ) as $row): ?>
<dt class="block_input w_90">
<?php echo $row['text'] ;?>
</dt>
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-23 07:31:00 UTC (rev 4532)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-24 16:13:09 UTC (rev 4533)
@@ -359,7 +359,7 @@
foreach($_SESSION['filters']['subtype'] as $key=>$row)
$list_type .=$key.',';
else{
- $allcats = categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$new_languages_id , 'exclude'=>array('0')));
+ $allcats = tep_get_status_array(self::$datatype);
foreach($allcats as $row)
$list_type .=$row['id'].',';
}
Modified: trunk/catalog/admin/includes/modules/pages/products.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/products.php 2012-07-23 07:31:00 UTC (rev 4532)
+++ trunk/catalog/admin/includes/modules/pages/products.php 2012-07-24 16:13:09 UTC (rev 4533)
@@ -472,7 +472,7 @@
foreach($_SESSION['filters']['subtype'] as $key=>$row)
$list_type .=$key.',';
else{
- $allcats = categorieUtility::get_category_tree(array('datatype'=>MGabCont::CallSt('GetClassDatatype'),'language_id'=>$new_languages_id , 'exclude'=>array('0')));
+ $allcats = tep_get_status_array(self::$datatype);
foreach($allcats as $row)
$list_type .=$row['id'].',';
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-23 07:31:10
|
Revision: 4532
http://oscss.svn.sourceforge.net/oscss/?rev=4532&view=rev
Author: oscim
Date: 2012-07-23 07:31:00 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
correction coquille , ajout comment dans le code des modules
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php
branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php
branches/2.1.1/catalog/admin/includes/modules/products/header_tags.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-07-23 07:12:33 UTC (rev 4531)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/productsACA.php 2012-07-23 07:31:00 UTC (rev 4532)
@@ -54,6 +54,7 @@
if($this->products_id > 0){
// test flag type module, si aucun, produist base
if(!isset($cl[$class]->flag_type_virtual)) $cl[$class]->flag_type_virtual=0;
+
// incremente tableau module unqiuement si flag ok
if($this->control_type_mod($cl[$class]->flag_type_virtual)) $list_mod[$class] = $cl[$class]->sort_order;
}
@@ -62,8 +63,7 @@
}
}
-
- if(count($list_mod)>1) {
+ if(count($list_mod)>=1) {
asort($list_mod);
foreach($list_mod as $class=>$s){
$this->modules[$class] =$cl[$class];
@@ -98,7 +98,7 @@
*/
private function control_type_mod($flag){
$this->load_type_product();
- if(in_array($flag,explode(',',$this->type_flag) ) || $flag==0) return true;
+ if(in_array( $this->type_flag ,explode(',',$flag) ) || $flag==0) return true;
else return false;
}
Modified: branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php 2012-07-23 07:12:33 UTC (rev 4531)
+++ branches/2.1.1/catalog/admin/includes/modules/products/desc_base.php 2012-07-23 07:31:00 UTC (rev 4532)
@@ -32,11 +32,19 @@
@brief class constructor
*/
function desc_base() {
+ /* name current classes */
$this->code = 'desc_base';
+ /* title this module, display in backoffice section */
$this->title = __('Description produits ');
+ /* desc this module, display in backoffice section */
$this->description = __('Description simple des produits avec chapeau');
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACAPRO_DESC_BASE_SORT_ORDER'))?MODULE_ACAPRO_DESC_BASE_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
+ /* Flag precise type product for activate this module.
+ if this flag no found, this module is already active */
+ $this->flag_type_virtual='0';
self::$pInfo= new objectInfo (array());
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-07-23 07:12:33 UTC (rev 4531)
+++ branches/2.1.1/catalog/admin/includes/modules/products/header_tags.php 2012-07-23 07:31:00 UTC (rev 4532)
@@ -36,11 +36,19 @@
global $language,$languages_id;
parent::load_lang();
+ /* name current classes */
$this->code = __CLASS__ ;
+ /* title this module, display in backoffice section */
$this->title = __('module acapro headertags text title');
+ /* desc this module, display in backoffice section */
$this->description = __('module acapro headertags text description');
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACACAT_HTC_SORT_ORDER'))?MODULE_ACACAT_HTC_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
+ /* Flag precise type product for activate this module.
+ if this flag no found, this module is already active */
+ $this->flag_type_virtual='0';
self::$pInfo= new objectInfo (array());
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-07-23 07:12:33 UTC (rev 4531)
+++ branches/2.1.1/catalog/admin/includes/modules/products/products_extra.php 2012-07-23 07:31:00 UTC (rev 4532)
@@ -26,11 +26,19 @@
@brief constructor
*/
function __construct(){
+ /* name current classes */
$this->code = __CLASS__;
+ /* title this module, display in backoffice section */
$this->title = __('products extra');
+ /* desc this module, display in backoffice section */
$this->description = __('products extra info') ;
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACA_PRO_EXTRA_SORT_ORDER')) ? MODULE_ACA_PRO_EXTRA_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
+ /* Flag precise type product for activate this module.
+ if this flag no found, this module is already active */
+ $this->flag_type_virtual='0';
self::$cInfo = new objectInfo(array());
@@ -191,7 +199,7 @@
$value_info = $value_query->fetchAllAssoc();
foreach($value_info as $row) {
- if((int)$row['languages_id'] ==0)
+ if((int)$row['languages_id'] ==0)
$value = $row['value'];
else
$value[$row['languages_id']] = $row['value'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-23 07:12:42
|
Revision: 4531
http://oscss.svn.sourceforge.net/oscss/?rev=4531&view=rev
Author: oscim
Date: 2012-07-23 07:12:33 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
correction coquille
add comment in code
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/productsACA.php
trunk/catalog/admin/includes/modules/products/desc_base.php
trunk/catalog/admin/includes/modules/products/header_tags.php
trunk/catalog/admin/includes/modules/products/products_extra.php
Modified: trunk/catalog/admin/includes/classes/drivers/productsACA.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-07-19 19:01:57 UTC (rev 4530)
+++ trunk/catalog/admin/includes/classes/drivers/productsACA.php 2012-07-23 07:12:33 UTC (rev 4531)
@@ -54,6 +54,7 @@
if($this->products_id > 0){
// test flag type module, si aucun, produist base
if(!isset($cl[$class]->flag_type_virtual)) $cl[$class]->flag_type_virtual=0;
+
// incremente tableau module unqiuement si flag ok
if($this->control_type_mod($cl[$class]->flag_type_virtual)) $list_mod[$class] = $cl[$class]->sort_order;
}
@@ -62,8 +63,7 @@
}
}
-
- if(count($list_mod)>1) {
+ if(count($list_mod)>=1) {
asort($list_mod);
foreach($list_mod as $class=>$s){
$this->modules[$class] =$cl[$class];
Modified: trunk/catalog/admin/includes/modules/products/desc_base.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/desc_base.php 2012-07-19 19:01:57 UTC (rev 4530)
+++ trunk/catalog/admin/includes/modules/products/desc_base.php 2012-07-23 07:12:33 UTC (rev 4531)
@@ -32,11 +32,19 @@
@brief class constructor
*/
function desc_base() {
+ /* name current classes */
$this->code = 'desc_base';
+ /* title this module, display in backoffice section */
$this->title = __('Description produits ');
+ /* desc this module, display in backoffice section */
$this->description = __('Description simple des produits avec chapeau');
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACAPRO_DESC_BASE_SORT_ORDER'))?MODULE_ACAPRO_DESC_BASE_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
+ /* Flag precise type product for activate this module.
+ if this flag no found, this module is already active */
+// $this->flag_type_virtual='1,2';
self::$pInfo= new objectInfo (array());
Modified: trunk/catalog/admin/includes/modules/products/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/header_tags.php 2012-07-19 19:01:57 UTC (rev 4530)
+++ trunk/catalog/admin/includes/modules/products/header_tags.php 2012-07-23 07:12:33 UTC (rev 4531)
@@ -36,11 +36,20 @@
global $language,$languages_id;
parent::load_lang();
+ /* name current classes */
$this->code = __CLASS__ ;
+ /* title this module, display in backoffice section */
$this->title = __('module acapro headertags text title');
+ /* desc this module, display in backoffice section */
$this->description = __('module acapro headertags text description');
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACACAT_HTC_SORT_ORDER'))?MODULE_ACACAT_HTC_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
+ /* Flag precise type product for activate this module.
+ if this flag no found, this module is already active
+ 0 for all , or precise int */
+ $this->flag_type_virtual=0;
self::$pInfo= new objectInfo (array());
Modified: trunk/catalog/admin/includes/modules/products/products_extra.php
===================================================================
--- trunk/catalog/admin/includes/modules/products/products_extra.php 2012-07-19 19:01:57 UTC (rev 4530)
+++ trunk/catalog/admin/includes/modules/products/products_extra.php 2012-07-23 07:12:33 UTC (rev 4531)
@@ -26,10 +26,15 @@
@brief constructor
*/
function __construct(){
+ /* name current classes */
$this->code = __CLASS__;
+ /* title this module, display in backoffice section */
$this->title = __('products extra');
+ /* desc this module, display in backoffice section */
$this->description = __('products extra info') ;
+ /* sort this module relative to other module actived */
$this->sort_order = (defined('MODULE_ACA_PRO_EXTRA_SORT_ORDER')) ? MODULE_ACA_PRO_EXTRA_SORT_ORDER : 0;
+ /* Active module */
$this->enabled = true;
self::$cInfo = new objectInfo(array());
@@ -191,7 +196,7 @@
$value_info = $value_query->fetchAllAssoc();
foreach($value_info as $row) {
- if((int)$row['languages_id'] ==0)
+ if((int)$row['languages_id'] ==0)
$value = $row['value'];
else
$value[$row['languages_id']] = $row['value'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-19 19:02:03
|
Revision: 4530
http://oscss.svn.sourceforge.net/oscss/?rev=4530&view=rev
Author: oscim
Date: 2012-07-19 19:01:57 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
correction coquille
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-19 19:01:47 UTC (rev 4529)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-19 19:01:57 UTC (rev 4530)
@@ -123,7 +123,7 @@
// no touch if just update one rows
- if(count($sql_data_array) > 3 ) {
+ if(count($sql_data_array) >= 3 ) {
/**
TODO Couplage avec MLinkto + datatype actif
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-19 19:01:53
|
Revision: 4529
http://oscss.svn.sourceforge.net/oscss/?rev=4529&view=rev
Author: oscim
Date: 2012-07-19 19:01:47 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/aca.php
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: trunk/catalog/admin/includes/classes/aca.php
===================================================================
--- trunk/catalog/admin/includes/classes/aca.php 2012-07-18 20:25:51 UTC (rev 4528)
+++ trunk/catalog/admin/includes/classes/aca.php 2012-07-19 19:01:47 UTC (rev 4529)
@@ -159,7 +159,7 @@
$r=array();
foreach ($this->modules as $key=>$module) {
if (method_exists($module, $method )) /// control presence method
- $r[$key]=$this->modules[$key]->$method($attrs[0]);
+ $r[$key]=$this->modules[$key]->$method($attrs);
}
return $r;
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 20:25:51 UTC (rev 4528)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-19 19:01:47 UTC (rev 4529)
@@ -123,8 +123,9 @@
tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
+
// no touch if just update one rows
- if(count($sql_data_array) > 3 ) {
+ if(count($sql_data_array) >= 3 ) {
/**
TODO Couplage avec MLinkto + datatype actif
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-18 20:25:58
|
Revision: 4528
http://oscss.svn.sourceforge.net/oscss/?rev=4528&view=rev
Author: oscim
Date: 2012-07-18 20:25:51 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
correction element de langue
debut mise en oeuvre de l'apport de colonne dans les filtres via les sub-module
sturation du module cms_content/header_tag
mise en oeuvre dans pages/cms_content
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
trunk/catalog/admin/includes/modules/content/header_tags.php
trunk/catalog/admin/includes/modules/pages/cms_content.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 20:25:51 UTC (rev 4528)
@@ -119,37 +119,41 @@
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content());
- tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
+ if(count($sql_data_array) > 0 )
+ tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
-/**
- TODO Couplage avec MLinkto + datatype actif
-*/
- if(DataTypes::is_active('categorie')) {
- /// Clean link posts to categorie and save new link
- if(isset($option['cPath']) && count($post['categories']) == 0)
- $post['categories'][] = $option['cPath'];
+ // no touch if just update one rows
+ if(count($sql_data_array) > 3 ) {
+ /**
+ TODO Couplage avec MLinkto + datatype actif
+ */
+ if(DataTypes::is_active('categorie')) {
+ /// Clean link posts to categorie and save new link
+ if(isset($option['cPath']) && count($post['categories']) == 0)
+ $post['categories'][] = $option['cPath'];
- sqlcategorie::DataInCat('content', $content_id, $post['categories']);
- }
- if( DataTypes::is_active('featured')) {
- if(count($post['linkto']['featured']) > 0)
- $r=sqlfeatured::AddLinkTo(
- array(
- 'datatype'=> 'content',
- 'id'=> $content_id,
- 'featured_array'=> $post['linkto']['featured']
- )
- );
- else
- $r=sqlfeatured::AddLinkTo(
- array(
- 'datatype'=> 'content',
- 'id'=> $content_id,
- 'featured_array'=> array(),
- )
- );
+ sqlcategorie::DataInCat('content', $content_id, $post['categories']);
+ }
+ if( DataTypes::is_active('featured')) {
+ if(count($post['linkto']['featured']) > 0)
+ $r=sqlfeatured::AddLinkTo(
+ array(
+ 'datatype'=> 'content',
+ 'id'=> $content_id,
+ 'featured_array'=> $post['linkto']['featured']
+ )
+ );
+ else
+ $r=sqlfeatured::AddLinkTo(
+ array(
+ 'datatype'=> 'content',
+ 'id'=> $content_id,
+ 'featured_array'=> array(),
+ )
+ );
+ }
}
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/aca_header_tags.txt 2012-07-18 20:25:51 UTC (rev 4528)
@@ -36,4 +36,10 @@
/* Block general */
$lang['module acapro headertags text title']="Contrôle tags entête" ;
$lang['module acapro headertags text description']="Contrôle tags entête" ;
+
+/* Filtre dans les pages datatype */
+$lang['@header_tags table heading title']="meta titre" ;
+$lang['@header_tags table heading description']="meta description" ;
+$lang['@header_tags table heading tags']="meta tags" ;
+
?>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/configuration/datatypeaccount.txt 2012-07-18 20:25:51 UTC (rev 4528)
@@ -9,16 +9,16 @@
@encode UTF-8
*/
-$lang['heading datatypeaccount configuration']="Configuration produits" ;
+$lang['heading datatypeaccount configuration']="Configuration clients/membres" ;
$lang['datatypeaccount tab configuration']="Configuration" ;
$lang['datatypeaccount tab module']="Modules" ;
/* tab configuration */
- $lang['heading datatypeaccount manage type accounts']="Gestion des types de produits" ;
- $lang['datatypeaccount legend manage type']="Types de produits" ;
- $lang['datatypeaccount type txt intro']="Les types de produits modifie le fonctionnement des produits, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos produits. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
+ $lang['heading datatypeaccount manage type accounts']="Gestion des types de clients/membres" ;
+ $lang['datatypeaccount legend manage type']="Types de clients/membres" ;
+ $lang['datatypeaccount type txt intro']="Les types de clients/membres modifie le fonctionnement des clients/membres, et permettent de construire des extensions ciblées avec des caractéristiques particulières. L'ensemble des ces modification peuvent impacter profondement le fonctionnement de vos clients/membres. Ne manipuler ces options que si vous savez ce que vous faites !!!" ;
$lang['datatypeaccount tableheading id']="Id" ;
$lang['datatypeaccount tableheading active']="Actif" ;
@@ -33,7 +33,7 @@
$lang['datatypeaccount tab virtual']="virtuel" ;
/* tab modules */
- $lang['datatypeaccount heading modules']="Activer / desactiver l'ensemble des modules specifique aux produits" ;
+ $lang['datatypeaccount heading modules']="Activer / desactiver l'ensemble des modules specifique aux clients/membres" ;
$lang['table heading module code']="Nom" ;
$lang['table heading module title']="Description" ;
Modified: trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt
===================================================================
--- trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/languages/fr_FR/modules/pages/cms_content.txt 2012-07-18 20:25:51 UTC (rev 4528)
@@ -26,6 +26,8 @@
$lang['cms_content table heading categories']="Catégorie" ;
$lang['cms_content table heading categories id']="Cat. id" ;
$lang['cms_content table heading title']="Titre" ;
+ $lang['cms_content table heading featured']="Mise en avant" ;
+ $lang['cms_content table heading featured id']="Mea.id" ;
$lang['cms_content table heading date_added']="Crée(s)" ;
$lang['cms_content table heading last modified']="Modifié(s)" ;
$lang['cms_content table heading status']="État" ;
Modified: trunk/catalog/admin/includes/modules/content/header_tags.php
===================================================================
--- trunk/catalog/admin/includes/modules/content/header_tags.php 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/modules/content/header_tags.php 2012-07-18 20:25:51 UTC (rev 4528)
@@ -49,6 +49,53 @@
/**
+ @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();
+
+ switch ($opt['type']) {
+ case 'allfields':
+ $array['fhtd.head_title_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_title_tag',
+ 'text'=>__('@header_tags table heading title'),
+ 'width'=>'8%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ $array['fhtd.head_desc_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_desc_tag',
+ 'text'=>__('@header_tags table heading description'),
+ 'width'=>'14%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ $array['fhtd.head_keywords_tag'] = array(
+ 'sort'=>true,
+ 'alias'=>'head_keywords_tag',
+ 'text'=>__('@header_tags table heading tags'),
+ 'width'=>'10%',
+ 'class'=>'tleft',
+// 'default'=>true,
+ );
+ break;
+
+ 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']."' ) ";
+
+ break;
+ }
+ return $array;
+ }
+
+ /**
Edition produit
UP db
*/
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-18 17:43:31 UTC (rev 4527)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-18 20:25:51 UTC (rev 4528)
@@ -143,6 +143,7 @@
)
);
+ /* DEB Datatype RootListing categorie */
if( DataTypes::is_active('categorie')) {
self::$allfields['cat.categories_id'] = array(
'sort'=>true,
@@ -158,7 +159,24 @@
'default'=>true,
);
}
+ /* END Datatype RootListing categorie */
+ /* DEB Datatype RootListing featured */
+ if( DataTypes::is_active('featured')) {
+ self::$allfields['fada.featured_id']= array(
+ 'sort'=>true,
+ 'alias'=>'featured_id',
+ 'text'=>__('cms_content table heading featured id'),
+ );
+ self::$allfields['fad.featured_title']= array(
+ 'sort'=>true,
+ 'alias'=>'featured',
+ 'text'=>__('cms_content table heading featured'),
+ 'width'=>'12%',
+ );
+ }
+ /* END Datatype RootListing featured */
+
self::$allfields['c.date_added'] = array(
'sort'=>true,
'alias'=>'added',
@@ -172,6 +190,16 @@
'width'=>'10%',
'default'=>true,
);
+
+ /* 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;
+ }
+ }
+ /* END Sub module add col */
+
self::$allfields['c.content_status'] = array(
'sort'=>true,
'alias'=>'status',
@@ -187,7 +215,6 @@
'default'=>true,
);
-
/**
@remarks Construct all list , fields , th/td
*/
@@ -668,17 +695,26 @@
$query_raw = "select ".$adjust->listfields.", c.content_id as id from " . TABLE_CONTENT . " c ".
" LEFT JOIN " . TABLE_CONTENT_DESCRIPTION . " cd ON(c.content_id =cd.content_id AND cd.language_id='".(int)$adjust->languages_id."') ";
- if( DataTypes::is_active('categorie')){
- $query_raw .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " p2c ON(c.content_id=p2c.content_id ) ".
- " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( cat.categories_id =p2c.categories_id ) ".
- " LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " catd ON( catd.categories_id =p2c.categories_id AND catd.language_id='".(int)$adjust->languages_id."' ) ";
- }
+ if( DataTypes::is_active('categorie')){
+ $query_raw .=" LEFT JOIN " . TABLE_CONTENT_TO_CATEGORIES . " p2c ON(c.content_id=p2c.content_id ) ".
+ " LEFT JOIN " . TABLE_CATEGORIES . " cat ON( cat.categories_id =p2c.categories_id ) ".
+ " LEFT JOIN " . TABLE_CATEGORIES_DESCRIPTION . " catd ON( catd.categories_id =p2c.categories_id AND catd.language_id='".(int)$adjust->languages_id."' ) ";
+ }
- if( DataTypes::is_active('featured')) {
- $query_raw .= " LEFT JOIN " . TABLE_FEATURED_DATA . " fada ON( fada.datatype_id=c.content_id AND datatype = 'content' ) ";
- $query_raw .= " LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
- }
+ if( DataTypes::is_active('featured')) {
+ $query_raw .= " LEFT JOIN " . TABLE_FEATURED_DATA . " fada ON( fada.datatype_id=c.content_id AND datatype = 'content' ) ";
+ $query_raw .= " LEFT JOIN " . TABLE_FEATURED_DESCRIPTION . " fad ON( fad.featured_id=fada.featured_id AND fad.languages_id = '".(int)$adjust->languages_id."' ) ";
+ }
+ /* DEB Sub module add table */
+ $r = self::$modules->__call('GetConf', array('languages_id'=>$languages_id, 'type'=>'tables')) ;
+ foreach($r as $mod=>$value){
+ foreach($value as $key=>$string){
+ $query_raw .= $string;
+ }
+ }
+ /* 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 ');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-18 17:43:37
|
Revision: 4527
http://oscss.svn.sourceforge.net/oscss/?rev=4527&view=rev
Author: oscim
Date: 2012-07-18 17:43:31 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fix bug lors mise a jour
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 15:35:36 UTC (rev 4526)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 17:43:31 UTC (rev 4527)
@@ -118,40 +118,42 @@
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content());
+ if(count($sql_data_array) > 0 )
+ tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
- tep_db_perform(TABLE_CONTENT, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "'");
+ // no touch if just update one rows
+ if(count($sql_data_array) > 3 ) {
+ /**
+ TODO Couplage avec MLinkto + datatype actif
+ */
+ if(DataTypes::is_active('categorie')) {
+ /// Clean link posts to categorie and save new link
+ if(isset($option['cPath']) && count($post['categories']) == 0)
+ $post['categories'][] = $option['cPath'];
-/**
- TODO Couplage avec MLinkto + datatype actif
-*/
- if(DataTypes::is_active('categorie')) {
- /// Clean link posts to categorie and save new link
- if(isset($option['cPath']) && count($post['categories']) == 0)
- $post['categories'][] = $option['cPath'];
+ sqlcategorie::DataInCat('content', $content_id, $post['categories']);
+ }
+ if( DataTypes::is_active('featured')) {
+ if(count($post['linkto']['featured']) > 0)
+ $r=sqlfeatured::AddLinkTo(
+ array(
+ 'datatype'=> 'content',
+ 'id'=> $content_id,
+ 'featured_array'=> $post['linkto']['featured']
+ )
+ );
+ else
+ $r=sqlfeatured::AddLinkTo(
+ array(
+ 'datatype'=> 'content',
+ 'id'=> $content_id,
+ 'featured_array'=> array(),
+ )
+ );
- sqlcategorie::DataInCat('content', $content_id, $post['categories']);
+ }
}
- if( DataTypes::is_active('featured')) {
- if(count($post['linkto']['featured']) > 0)
- $r=sqlfeatured::AddLinkTo(
- array(
- 'datatype'=> 'content',
- 'id'=> $content_id,
- 'featured_array'=> $post['linkto']['featured']
- )
- );
- else
- $r=sqlfeatured::AddLinkTo(
- array(
- 'datatype'=> 'content',
- 'id'=> $content_id,
- 'featured_array'=> array(),
- )
- );
-
- }
-
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
$sql_data_array = array();
$language_id = $list_languages[$i]['id'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-18 15:35:46
|
Revision: 4526
http://oscss.svn.sourceforge.net/oscss/?rev=4526&view=rev
Author: oscim
Date: 2012-07-18 15:35:36 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
coquille sqlcontent
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 15:33:55 UTC (rev 4525)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 15:35:36 UTC (rev 4526)
@@ -153,7 +153,7 @@
}
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
-
+ $sql_data_array = array();
$language_id = $list_languages[$i]['id'];
if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-18 15:34:04
|
Revision: 4525
http://oscss.svn.sourceforge.net/oscss/?rev=4525&view=rev
Author: oscim
Date: 2012-07-18 15:33:55 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
coquille
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-17 17:15:33 UTC (rev 4524)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-18 15:33:55 UTC (rev 4525)
@@ -153,7 +153,7 @@
}
for ($i=0, $n=sizeof($list_languages); $i<$n; $i++) {
-
+ $sql_data_array = array();
$language_id = $list_languages[$i]['id'];
if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-17 17:15:39
|
Revision: 4524
http://oscss.svn.sourceforge.net/oscss/?rev=4524&view=rev
Author: oscim
Date: 2012-07-17 17:15:33 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
coquille dasn l'ordonnancement priorit?\195?\169 des plugin entre les differents theme
Modified Paths:
--------------
trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php
Modified: trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php
===================================================================
--- trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php 2012-07-17 13:02:54 UTC (rev 4523)
+++ trunk/catalog/includes/classes/core_page/overlay/oscss_plugins.php 2012-07-17 17:15:33 UTC (rev 4524)
@@ -99,13 +99,14 @@
$active = true;
$fpath = $path;
}
- $dir_ws_here = DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME.'/'. DIR_WS_INCLUDES. 'plugins/generic/'.$file. '/';
- $path= $dir_ws_here. 'includes_header.php';
- if (page::TestFile($path)){
- $active = true;
- $fpath = $path;
+ else {
+ $dir_ws_here = DIR_WS_TEMPLATES . DEFAULT_TEMPLATE_NAME.'/'. DIR_WS_INCLUDES. 'plugins/generic/'.$file. '/';
+ $path= $dir_ws_here. 'includes_header.php';
+ if (page::TestFile($path)){
+ $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-07-17 13:03:03
|
Revision: 4523
http://oscss.svn.sourceforge.net/oscss/?rev=4523&view=rev
Author: oscim
Date: 2012-07-17 13:02:54 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
correction update content
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
Modified: branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-17 13:00:39 UTC (rev 4522)
+++ branches/2.1.1/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-17 13:02:54 UTC (rev 4523)
@@ -156,12 +156,13 @@
$language_id = $list_languages[$i]['id'];
- $sql_data_array = array('content_text' => tep_db_prepare_input($post['content_text'][$language_id]) /*tep_db_prepare_input($content_text[$language_id])*/,
- 'content_title' => tep_db_prepare_input($post['content_title'][$language_id]) /*str_replace('&','&',tep_db_prepare_input($content_title[$language_id]))*/);
+ if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]);
+ if(isset($post['content_title'][$language_id])) $sql_data_array['content_title'] =tep_db_prepare_input($post['content_title'][$language_id]);
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content_description ($language_id));
+ if(count($sql_data_array) > 0)
tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "' and language_id = '" . (int)$language_id . "'");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-17 13:00:48
|
Revision: 4522
http://oscss.svn.sourceforge.net/oscss/?rev=4522&view=rev
Author: oscim
Date: 2012-07-17 13:00:39 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
coquille sql lors update d'un content
correction section delete deja corrig?\195?\169 sur branche
Ajout element image manquant dans le BO sur mise en forme
Modified Paths:
--------------
trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
trunk/catalog/admin/includes/modules/pages/cms_content.php
Added Paths:
-----------
trunk/catalog/admin/includes/template/oscss/img/bg-input-focus.png
trunk/catalog/admin/includes/template/oscss/img/bg-input.png
trunk/catalog/admin/includes/template/oscss/img/sprite.png
Modified: trunk/catalog/admin/includes/classes/drivers/sqlcontent.php
===================================================================
--- trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-15 16:34:36 UTC (rev 4521)
+++ trunk/catalog/admin/includes/classes/drivers/sqlcontent.php 2012-07-17 13:00:39 UTC (rev 4522)
@@ -156,12 +156,13 @@
$language_id = $list_languages[$i]['id'];
- $sql_data_array = array('content_text' => tep_db_prepare_input($post['content_text'][$language_id]) /*tep_db_prepare_input($content_text[$language_id])*/,
- 'content_title' => tep_db_prepare_input($post['content_title'][$language_id]) /*str_replace('&','&',tep_db_prepare_input($content_title[$language_id]))*/);
+ if(isset($post['content_text'][$language_id])) $sql_data_array['content_text'] = tep_db_prepare_input($post['content_text'][$language_id]) ;
+ if(isset($post['content_title'][$language_id])) $sql_data_array['content_title'] =tep_db_prepare_input($post['content_title'][$language_id]);
$sql_data_array = array_merge($sql_data_array, self::$modules->get_update_table_content_description ($language_id));
+ if(count($sql_data_array) > 0)
tep_db_perform(TABLE_CONTENT_DESCRIPTION, $sql_data_array, 'update', "content_id = '" . (int)$content_id . "' and language_id = '" . (int)$language_id . "'");
}
Modified: trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab
===================================================================
--- trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-07-15 16:34:36 UTC (rev 4521)
+++ trunk/catalog/admin/includes/gabarit/cms_content/display_view.delete.gab 2012-07-17 13:00:39 UTC (rev 4522)
@@ -8,15 +8,16 @@
@author oscim <mail aur...@os...> <www http://www.oscim.fr>
@encode UTF-8
*/
+
?>
<div class="box_uniq">
<h3><?php echo __('text info heading delete content'); ?></h3>
- <?php echo tep_draw_form('content', cms_content::FILENAME, 'cID=' . cms_content::$cInfo->content_id . '&action=deleteconfirm') ?>
+ <?php echo tep_draw_form('content', cms_content::FILENAME, 'cID=' . cms_content::$Id . '&action=deleteconfirm') ?>
<p><?php echo __('text info delete content intro') ?></p>
- <p><?php echo cms_content::$cInfo->content_name ; ?></p>
+ <p><?php echo cms_content::$Info->content_name ; ?></p>
<div class="button_nav">
- <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$cInfo->content_id), IMAGE_CANCEL); ?>
+ <?php echo tep_image_submit('button_delete.gif', IMAGE_DELETE) .tep_js_back(tep_href_link(cms_content::FILENAME, 'cID=' . cms_content::$Info->content_id), IMAGE_CANCEL); ?>
</div>
</form>
</div>
\ No newline at end of file
Modified: trunk/catalog/admin/includes/modules/pages/cms_content.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-15 16:34:36 UTC (rev 4521)
+++ trunk/catalog/admin/includes/modules/pages/cms_content.php 2012-07-17 13:00:39 UTC (rev 4522)
@@ -618,6 +618,7 @@
case 'edit':
case 'new':
global $language_id;
+
if( (int)self::$Id > 0) {
self::$Info = sqlcontent::fetch(array('id'=>self::$Id,'language_id'=>$language_id), true);
}
@@ -717,6 +718,7 @@
*/
case 'delete':
+ self::GetDBValue(self::$Id);
return MGabCont::CallGab(self::$action,__FUNCTION__,__CLASS__);
break;
case 'edit':
Added: trunk/catalog/admin/includes/template/oscss/img/bg-input-focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/admin/includes/template/oscss/img/bg-input-focus.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/admin/includes/template/oscss/img/bg-input.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/admin/includes/template/oscss/img/bg-input.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/catalog/admin/includes/template/oscss/img/sprite.png
===================================================================
(Binary files differ)
Property changes on: trunk/catalog/admin/includes/template/oscss/img/sprite.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <os...@us...> - 2012-07-15 16:34:43
|
Revision: 4521
http://oscss.svn.sourceforge.net/oscss/?rev=4521&view=rev
Author: oscim
Date: 2012-07-15 16:34:36 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
ajout script mise en forme js ds le template oscss du BO
Modified Paths:
--------------
trunk/catalog/admin/includes/template/oscss/gabarit-1.php
trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
trunk/catalog/includes/classes/split_page_results.php
Added Paths:
-----------
trunk/catalog/admin/includes/template/oscss/js/
trunk/catalog/admin/includes/template/oscss/js/jquery.uniform.min.js
trunk/catalog/admin/includes/template/oscss/uniform.default.css
Modified: trunk/catalog/admin/includes/template/oscss/gabarit-1.php
===================================================================
--- trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-15 14:27:02 UTC (rev 4520)
+++ trunk/catalog/admin/includes/template/oscss/gabarit-1.php 2012-07-15 16:34:36 UTC (rev 4521)
@@ -22,11 +22,20 @@
<?php
/** 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"); ?>
+ @include( DIR_WS_INCLUDES . "content/".$page_admin.".header.inc");
+ tep_include_file (DIR_WS_TEMPLATE."js/jquery.uniform.min.js",true);
+ ?>
+
+<script type="text/javascript" charset="utf-8">
+ $(function(){
+ $("input[type=text],input[type=radio],input[type=checkbox], select, textarea").uniform();
+ });
+</script>
</head>
<body class="<?php echo $page_admin; ?>">
<div id="glob">
Added: trunk/catalog/admin/includes/template/oscss/js/jquery.uniform.min.js
===================================================================
--- trunk/catalog/admin/includes/template/oscss/js/jquery.uniform.min.js (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/js/jquery.uniform.min.js 2012-07-15 16:34:36 UTC (rev 4521)
@@ -0,0 +1 @@
+(function(a){a.uniform={options:{selectClass:"selector",radioClass:"radio",checkboxClass:"checker",fileClass:"uploader",filenameClass:"filename",fileBtnClass:"action",fileDefaultText:"No file selected",fileBtnText:"Choose File",checkedClass:"checked",focusClass:"focus",disabledClass:"disabled",buttonClass:"button",activeClass:"active",hoverClass:"hover",useID:true,idPrefix:"uniform",resetSelector:false,autoHide:true},elements:[]};if(a.browser.msie&&a.browser.version<7){a.support.selectOpacity=false}else{a.support.selectOpacity=true}a.fn.uniform=function(k){k=a.extend(a.uniform.options,k);var d=this;if(k.resetSelector!=false){a(k.resetSelector).mouseup(function(){function l(){a.uniform.update(d)}setTimeout(l,10)})}function j(l){$el=a(l);$el.addClass($el.attr("type"));b(l)}function g(l){a(l).addClass("uniform");b(l)}function i(o){var m=a(o);var p=a("<div>"),l=a("<span>");p.addClass(k.buttonClass);if(k.useID&&m.attr("id")!=""){p.attr("id",k.idPrefix+"-"+m.attr("id"))}var n;if(m.is("a")||m.is("button")){n=m.text()}else{if(m.is(":submit")||m.is(":reset")||m.is("input[type=button]")){n=m.attr("value")}}n=n==""?m.is(":reset")?"Reset":"Submit":n;l.html(n);m.css("opacity",0);m.wrap(p);m.wrap(l);p=m.closest("div");l=m.closest("span");if(m.is(":disabled")){p.addClass(k.disabledClass)}p.bind({"mouseenter.uniform":function(){p.addClass(k.hoverClass)},"mouseleave.uniform":function(){p.removeClass(k.hoverClass);p.removeClass(k.activeClass)},"mousedown.uniform touchbegin.uniform":function(){p.addClass(k.activeClass)},"mouseup.uniform touchend.uniform":function(){p.removeClass(k.activeClass)},"click.uniform touchend.uniform":function(r){if(a(r.target).is("span")||a(r.target).is("div")){if(o[0].dispatchEvent){var q=document.createEvent("MouseEvents");q.initEvent("click",true,true);o[0].dispatchEvent(q)}else{o[0].click()}}}});o.bind({"focus.uniform":function(){p.addClass(k.focusClass)},"blur.uniform":function(){p.removeClass(k.focusClass)}});a.uniform.noSelect(p);b(o)}function e(o){var m=a(o);var p=a("<div />"),l=a("<span />");if(!m.css("display")=="none"&&k.autoHide){p.hide()}p.addClass(k.selectClass);if(k.useID&&o.attr("id")!=""){p.attr("id",k.idPrefix+"-"+o.attr("id"))}var n=o.find(":selected:first");if(n.length==0){n=o.find("option:first")}l.html(n.html());o.css("opacity",0);o.wrap(p);o.before(l);p=o.parent("div");l=o.siblings("span");o.bind({"change.uniform":function(){l.text(o.find(":selected").html());p.removeClass(k.activeClass)},"focus.uniform":function(){p.addClass(k.focusClass)},"blur.uniform":function(){p.removeClass(k.focusClass);p.removeClass(k.activeClass)},"mousedown.uniform touchbegin.uniform":function(){p.addClass(k.activeClass)},"mouseup.uniform touchend.uniform":function(){p.removeClass(k.activeClass)},"click.uniform touchend.uniform":function(){p.removeClass(k.activeClass)},"mouseenter.uniform":function(){p.addClass(k.hoverClass)},"mouseleave.uniform":function(){p.removeClass(k.hoverClass);p.removeClass(k.activeClass)},"keyup.uniform":function(){l.text(o.find(":selected").html())}});if(a(o).attr("disabled")){p.addClass(k.disabledClass)}a.uniform.noSelect(l);b(o)}function f(n){var m=a(n);var o=a("<div />"),l=a("<span />");if(!m.css("display")=="none"&&k.autoHide){o.hide()}o.addClass(k.checkboxClass);if(k.useID&&n.attr("id")!=""){o.attr("id",k.idPrefix+"-"+n.attr("id"))}a(n).wrap(o);a(n).wrap(l);l=n.parent();o=l.parent();a(n).css("opacity",0).bind({"focus.uniform":function(){o.addClass(k.focusClass)},"blur.uniform":function(){o.removeClass(k.focusClass)},"click.uniform touchend.uniform":function(){if(!a(n).attr("checked")){l.removeClass(k.checkedClass)}else{l.addClass(k.checkedClass)}},"mousedown.uniform touchbegin.uniform":function(){o.addClass(k.activeClass)},"mouseup.uniform touchend.uniform":function(){o.removeClass(k.activeClass)},"mouseenter.uniform":function(){o.addClass(k.hoverClass)},"mouseleave.uniform":function(){o.removeClass(k.hoverClass);o.removeClass(k.activeClass)}});if(a(n).attr("checked")){l.addClass(k.checkedClass)}if(a(n).attr("disabled")){o.addClass(k.disabledClass)}b(n)}function c(n){var m=a(n);var o=a("<div />"),l=a("<span />");if(!m.css("display")=="none"&&k.autoHide){o.hide()}o.addClass(k.radioClass);if(k.useID&&n.attr("id")!=""){o.attr("id",k.idPrefix+"-"+n.attr("id"))}a(n).wrap(o);a(n).wrap(l);l=n.parent();o=l.parent();a(n).css("opacity",0).bind({"focus.uniform":function(){o.addClass(k.focusClass)},"blur.uniform":function(){o.removeClass(k.focusClass)},"click.uniform touchend.uniform":function(){if(!a(n).attr("checked")){l.removeClass(k.checkedClass)}else{var p=k.radioClass.split(" ")[0];a("."+p+" span."+k.checkedClass+":has([name='"+a(n).attr("name")+"'])").removeClass(k.checkedClass);l.addClass(k.checkedClass)}},"mousedown.uniform touchend.uniform":function(){if(!a(n).is(":disabled")){o.addClass(k.activeClass)}},"mouseup.uniform touchbegin.uniform":function(){o.removeClass(k.activeClass)},"mouseenter.uniform touchend.uniform":function(){o.addClass(k.hoverClass)},"mouseleave.uniform":function(){o.removeClass(k.hoverClass);o.removeClass(k.activeClass)}});if(a(n).attr("checked")){l.addClass(k.checkedClass)}if(a(n).attr("disabled")){o.addClass(k.disabledClass)}b(n)}function h(q){var o=a(q);var r=a("<div />"),p=a("<span>"+k.fileDefaultText+"</span>"),m=a("<span>"+k.fileBtnText+"</span>");if(!o.css("display")=="none"&&k.autoHide){r.hide()}r.addClass(k.fileClass);p.addClass(k.filenameClass);m.addClass(k.fileBtnClass);if(k.useID&&o.attr("id")!=""){r.attr("id",k.idPrefix+"-"+o.attr("id"))}o.wrap(r);o.after(m);o.after(p);r=o.closest("div");p=o.siblings("."+k.filenameClass);m=o.siblings("."+k.fileBtnClass);if(!o.attr("size")){var l=r.width();o.attr("size",l/10)}var n=function(){var s=o.val();if(s===""){s=k.fileDefaultText}else{s=s.split(/[\/\\]+/);s=s[(s.length-1)]}p.text(s)};n();o.css("opacity",0).bind({"focus.uniform":function(){r.addClass(k.focusClass)},"blur.uniform":function(){r.removeClass(k.focusClass)},"mousedown.uniform":function(){if(!a(q).is(":disabled")){r.addClass(k.activeClass)}},"mouseup.uniform":function(){r.removeClass(k.activeClass)},"mouseenter.uniform":function(){r.addClass(k.hoverClass)},"mouseleave.uniform":function(){r.removeClass(k.hoverClass);r.removeClass(k.activeClass)}});if(a.browser.msie){o.bind("click.uniform.ie7",function(){setTimeout(n,0)})}else{o.bind("change.uniform",n)}if(o.attr("disabled")){r.addClass(k.disabledClass)}a.uniform.noSelect(p);a.uniform.noSelect(m);b(q)}a.uniform.restore=function(l){if(l==undefined){l=a(a.uniform.elements)}a(l).each(function(){if(a(this).is(":checkbox")){a(this).unwrap().unwrap()}else{if(a(this).is("select")){a(this).siblings("span").remove();a(this).unwrap()}else{if(a(this).is(":radio")){a(this).unwrap().unwrap()}else{if(a(this).is(":file")){a(this).siblings("span").remove();a(this).unwrap()}else{if(a(this).is("button, :submit, :reset, a, input[type='button']")){a(this).unwrap().unwrap()}}}}}a(this).unbind(".uniform");a(this).css("opacity","1");var m=a.inArray(a(l),a.uniform.elements);a.uniform.elements.splice(m,1)})};function b(l){l=a(l).get();if(l.length>1){a.each(l,function(m,n){a.uniform.elements.push(n)})}else{a.uniform.elements.push(l)}}a.uniform.noSelect=function(l){function m(){return false}a(l).each(function(){this.onselectstart=this.ondragstart=m;a(this).mousedown(m).css({MozUserSelect:"none"})})};a.uniform.update=function(l){if(l==undefined){l=a(a.uniform.elements)}l=a(l);l.each(function(){var n=a(this);if(n.is("select")){var m=n.siblings("span");var p=n.parent("div");p.removeClass(k.hoverClass+" "+k.focusClass+" "+k.activeClass);m.html(n.find(":selected").html());if(n.is(":disabled")){p.addClass(k.disabledClass)}else{p.removeClass(k.disabledClass)}}else{if(n.is(":checkbox")){var m=n.closest("span");var p=n.closest("div");p.removeClass(k.hoverClass+" "+k.focusClass+" "+k.activeClass);m.removeClass(k.checkedClass);if(n.is(":checked")){m.addClass(k.checkedClass)}if(n.is(":disabled")){p.addClass(k.disabledClass)}else{p.removeClass(k.disabledClass)}}else{if(n.is(":radio")){var m=n.closest("span");var p=n.closest("div");p.removeClass(k.hoverClass+" "+k.focusClass+" "+k.activeClass);m.removeClass(k.checkedClass);if(n.is(":checked")){m.addClass(k.checkedClass)}if(n.is(":disabled")){p.addClass(k.disabledClass)}else{p.removeClass(k.disabledClass)}}else{if(n.is(":file")){var p=n.parent("div");var o=n.siblings(k.filenameClass);btnTag=n.siblings(k.fileBtnClass);p.removeClass(k.hoverClass+" "+k.focusClass+" "+k.activeClass);o.text(n.val());if(n.is(":disabled")){p.addClass(k.disabledClass)}else{p.removeClass(k.disabledClass)}}else{if(n.is(":submit")||n.is(":reset")||n.is("button")||n.is("a")||l.is("input[type=button]")){var p=n.closest("div");p.removeClass(k.hoverClass+" "+k.focusClass+" "+k.activeClass);if(n.is(":disabled")){p.addClass(k.disabledClass)}else{p.removeClass(k.disabledClass)}}}}}}})};return this.each(function(){if(a.support.selectOpacity){var l=a(this);if(l.is("select")){if(l.attr("multiple")!=true){if(l.attr("size")==undefined||l.attr("size")<=1){e(l)}}}else{if(l.is(":checkbox")){f(l)}else{if(l.is(":radio")){c(l)}else{if(l.is(":file")){h(l)}else{if(l.is(":text, :password, input[type='email']")){j(l)}else{if(l.is("textarea")){g(l)}else{if(l.is("a")||l.is(":submit")||l.is(":reset")||l.is("button")||l.is("input[type=button]")){i(l)}}}}}}}}})}})(jQuery);
\ No newline at end of file
Modified: trunk/catalog/admin/includes/template/oscss/stylesheet-1.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-15 14:27:02 UTC (rev 4520)
+++ trunk/catalog/admin/includes/template/oscss/stylesheet-1.css 2012-07-15 16:34:36 UTC (rev 4521)
@@ -147,8 +147,11 @@
a.button.ActionBack,
input.button.ActionBack,
-button.button.ActionBack {background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+button.button.ActionBack {color:white;background:#ccc url(img/1/button-back.jpg) left -40px repeat-x;}
+a:hover.button.ActionBack,
+input:hover.button.ActionBack,
+button:hover.button.ActionBack {color:gray;}
input[type=image].button,
a.buttonimg img{ opacity:1;}
@@ -287,8 +290,9 @@
#user li { position:relative; float:left;}
#user 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; }
/* Switcher */
-p.themeSwitcher { float:right; margin:0; padding:2px 1em 0 0; text-align:right; width:250px; color:white;}
-p.themeSwitcher select { vertical-align:middle; font-size:0.9em; width:100px; }
+p.themeSwitcher { float:right; margin:0; padding:0 1em 0 0; text-align:right;/* width:250px;*/ color:white;}
+p.themeSwitcher select { margin:0; padding:0; vertical-align:middle; width:100px; color:white;}
+p.themeSwitcher select option{ color:white;font-size:0.9em; }
/* Bookmark */
#menubookmark p.themeSwitcher select option,
#menurecently p.themeSwitcher select#recently_viewed option {display:block;}
Added: trunk/catalog/admin/includes/template/oscss/uniform.default.css
===================================================================
--- trunk/catalog/admin/includes/template/oscss/uniform.default.css (rev 0)
+++ trunk/catalog/admin/includes/template/oscss/uniform.default.css 2012-07-15 16:34:36 UTC (rev 4521)
@@ -0,0 +1,610 @@
+/*
+
+Uniform Theme: Uniform Default
+Version: 1.6
+By: Josh Pyles
+License: MIT License
+---
+For use with the Uniform plugin:
+http://pixelmatrixdesign.com/uniform/
+---
+Generated by Uniform Theme Generator:
+http://pixelmatrixdesign.com/uniform/themer.html
+
+*/
+
+/* Global Declaration */
+
+div.selector,
+div.selector span,
+div.checker span,
+div.radio span,
+div.uploader,
+div.uploader span.action,
+div.button,
+div.button span {
+ background-image: url(img/sprite.png);
+ background-repeat: no-repeat;
+ -webkit-font-smoothing: antialiased;
+}
+
+.selector,
+.radio,
+.checker,
+.uploader,
+.button,
+.selector *,
+.radio *,
+.checker *,
+.uploader *,
+.button *{
+ margin: 0;
+ padding: 0;
+}
+
+/* INPUT & TEXTAREA */
+
+input.text,
+input.email,
+input.password,
+textarea.uniform {
+ font-size: 12px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-weight: normal;
+ padding: 3px;
+ color: #777;
+ background:white url('img/bg-input-focus.png') repeat-x 0px 0px;
+ background:white url('img/bg-input.png') repeat-x 0px 0px;
+ border-top: solid 1px #aaa;
+ border-left: solid 1px #aaa;
+ border-bottom: solid 1px #ccc;
+ border-right: solid 1px #ccc;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ outline: 0;
+}
+
+input.text:focus,
+input.email:focus,
+input.password:focus,
+textarea.uniform:focus {
+ -webkit-box-shadow: 0px 0px 4px rgba(0,0,0,0.3);
+ -moz-box-shadow: 0px 0px 4px rgba(0,0,0,0.3);
+ box-shadow: 0px 0px 4px rgba(0,0,0,0.3);
+ border-color: #999;
+ background:white url('img/bg-input-focus.png') repeat-x 0px 0px;
+}
+
+/* SPRITES */
+
+/* Select */
+
+div.selector {
+ background-position: -483px -130px;
+ line-height: 26px;
+ height: 26px;
+}
+
+div.selector span {
+ background-position: right 0px;
+ height: 26px;
+ line-height: 26px;
+}
+
+div.selector select {
+ /* change these to adjust positioning of select element */
+ top: 0px;
+ left: 0px;
+}
+
+div.selector:active,
+div.selector.active {
+ background-position: -483px -156px;
+}
+
+div.selector:active span,
+div.selector.active span {
+ background-position: right -26px;
+}
+
+div.selector.focus, div.selector.hover, div.selector:hover {
+ background-position: -483px -182px;
+}
+
+div.selector.focus span, div.selector.hover span, div.selector:hover span {
+ background-position: right -52px;
+}
+
+div.selector.focus:active,
+div.selector.focus.active,
+div.selector:hover:active,
+div.selector.active:hover {
+ background-position: -483px -208px;
+}
+
+div.selector.focus:active span,
+div.selector:hover:active span,
+div.selector.active:hover span,
+div.selector.focus.active span {
+ background-position: right -78px;
+}
+
+div.selector.disabled {
+ background-position: -483px -234px;
+}
+
+div.selector.disabled span {
+ background-position: right -104px;
+}
+
+/* Checkbox */
+
+div.checker {
+ width: 19px;
+ height: 19px;
+}
+
+div.checker input {
+ width: 19px;
+ height: 19px;
+}
+
+div.checker span {
+ background-position: 0px -260px;
+ height: 19px;
+ width: 19px;
+}
+
+div.checker:active span,
+div.checker.active span {
+ background-position: -19px -260px;
+}
+
+div.checker.focus span,
+div.checker:hover span {
+ background-position: -38px -260px;
+}
+
+div.checker.focus:active span,
+div.checker:active:hover span,
+div.checker.active:hover span,
+div.checker.focus.active span {
+ background-position: -57px -260px;
+}
+
+div.checker span.checked {
+ background-position: -76px -260px;
+}
+
+div.checker:active span.checked,
+div.checker.active span.checked {
+ background-position: -95px -260px;
+}
+
+div.checker.focus span.checked,
+div.checker:hover span.checked {
+ background-position: -114px -260px;
+}
+
+div.checker.focus:active span.checked,
+div.checker:hover:active span.checked,
+div.checker.active:hover span.checked,
+div.checker.active.focus span.checked {
+ background-position: -133px -260px;
+}
+
+div.checker.disabled span,
+div.checker.disabled:active span,
+div.checker.disabled.active span {
+ background-position: -152px -260px;
+}
+
+div.checker.disabled span.checked,
+div.checker.disabled:active span.checked,
+div.checker.disabled.active span.checked {
+ background-position: -171px -260px;
+}
+
+/* Radio */
+
+div.radio {
+ width: 18px;
+ height: 18px;
+}
+
+div.radio input {
+ width: 18px;
+ height: 18px;
+}
+
+div.radio span {
+ height: 18px;
+ width: 18px;
+ background-position: 0px -279px;
+}
+
+div.radio:active span,
+div.radio.active span {
+ background-position: -18px -279px;
+}
+
+div.radio.focus span,
+div.radio:hover span {
+ background-position: -36px -279px;
+}
+
+div.radio.focus:active span,
+div.radio:active:hover span,
+div.radio.active:hover span,
+div.radio.active.focus span {
+ background-position: -54px -279px;
+}
+
+div.radio span.checked {
+ background-position: -72px -279px;
+}
+
+div.radio:active span.checked,
+div.radio.active span.checked {
+ background-position: -90px -279px;
+}
+
+div.radio.focus span.checked, div.radio:hover span.checked {
+ background-position: -108px -279px;
+}
+
+div.radio.focus:active span.checked,
+div.radio:hover:active span.checked,
+div.radio.focus.active span.checked,
+div.radio.active:hover span.checked {
+ background-position: -126px -279px;
+}
+
+div.radio.disabled span,
+div.radio.disabled:active span,
+div.radio.disabled.active span {
+ background-position: -144px -279px;
+}
+
+div.radio.disabled span.checked,
+div.radio.disabled:active span.checked,
+div.radio.disabled.active span.checked {
+ background-position: -162px -279px;
+}
+
+/* Uploader */
+
+div.uploader {
+ background-position: 0px -297px;
+ height: 28px;
+}
+
+div.uploader span.action {
+ background-position: right -409px;
+ height: 24px;
+ line-height: 24px;
+}
+
+div.uploader span.filename {
+ height: 24px;
+ /* change this line to adjust positioning of filename area */
+ margin: 2px 0px 2px 2px;
+ line-height: 24px;
+}
+
+div.uploader.focus,
+div.uploader.hover,
+div.uploader:hover {
+ background-position: 0px -353px;
+}
+
+div.uploader.focus span.action,
+div.uploader.hover span.action,
+div.uploader:hover span.action {
+ background-position: right -437px;
+}
+
+div.uploader.active span.action,
+div.uploader:active span.action {
+ background-position: right -465px;
+}
+
+div.uploader.focus.active span.action,
+div.uploader:focus.active span.action,
+div.uploader.focus:active span.action,
+div.uploader:focus:active span.action {
+ background-position: right -493px;
+}
+
+div.uploader.disabled {
+ background-position: 0px -325px;
+}
+
+div.uploader.disabled span.action {
+ background-position: right -381px;
+}
+
+div.button {
+ background-position: 0px -523px;
+}
+
+div.button span {
+ background-position: right -643px;
+}
+
+div.button.focus,
+div.button:focus,
+div.button:hover,
+div.button.hover {
+ background-position: 0px -553px;
+}
+
+div.button.focus span,
+div.button:focus span,
+div.button:hover span,
+div.button.hover span {
+ background-position: right -673px;
+}
+
+div.button.active,
+div.button:active {
+ background-position: 0px -583px;
+}
+
+div.button.active span,
+div.button:active span {
+ background-position: right -703px;
+ color: #555;
+}
+
+div.button.disabled,
+div.button:disabled {
+ background-position: 0px -613px;
+}
+
+div.button.disabled span,
+div.button:disabled span {
+ background-position: right -733px;
+ color: #bbb;
+ cursor: default;
+}
+
+/* PRESENTATION */
+
+/* Button */
+
+div.button {
+ height: 30px;
+}
+
+div.button span {
+ margin-left: 13px;
+ height: 22px;
+ padding-top: 8px;
+ font-weight: bold;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 12px;
+ letter-spacing: 1px;
+ text-transform: uppercase;
+ padding-left: 2px;
+ padding-right: 15px;
+}
+
+/* Select */
+div.selector {
+ width: 190px;
+ font-size: 12px;
+}
+
+div.selector select {
+ min-width: 190px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 12px;
+ border: solid 1px #fff;
+}
+
+div.selector span {
+ padding: 0px 25px 0px 2px;
+ cursor: pointer;
+}
+
+div.selector span {
+ color: #666;
+ width: 158px;
+ text-shadow: 0 1px 0 #fff;
+}
+
+div.selector.disabled span {
+ color: #bbb;
+}
+
+/* Checker */
+div.checker {
+ margin-right: 5px;
+}
+
+/* Radio */
+div.radio {
+ margin-right: 3px;
+}
+
+/* Uploader */
+div.uploader {
+ width: 190px;
+ cursor: pointer;
+}
+
+div.uploader span.action {
+ width: 85px;
+ text-align: center;
+ text-shadow: #fff 0px 1px 0px;
+ background-color: #fff;
+ font-size: 11px;
+ font-weight: bold;
+}
+
+div.uploader span.filename {
+ color: #777;
+ width: 82px;
+ border-right: solid 1px #bbb;
+ font-size: 11px;
+}
+
+div.uploader input {
+ width: 190px;
+}
+
+div.uploader.disabled span.action {
+ color: #aaa;
+}
+
+div.uploader.disabled span.filename {
+ border-color: #ddd;
+ color: #aaa;
+}
+/*
+
+CORE FUNCTIONALITY
+
+Not advised to edit stuff below this line
+-----------------------------------------------------
+*/
+
+.selector,
+.checker,
+.button,
+.radio,
+.uploader {
+ display: -moz-inline-box;
+ display: inline-block;
+ vertical-align: middle;
+ zoom: 1;
+ *display: inline;
+}
+
+.selector select:focus, .radio input:focus, .checker input:focus, .uploader input:focus {
+ outline: 0;
+}
+
+/* Button */
+
+div.button a,
+div.button button,
+div.button input {
+ position: absolute;
+}
+
+div.button {
+ cursor: pointer;
+ position: relative;
+}
+
+div.button span {
+ display: -moz-inline-box;
+ display: inline-block;
+ line-height: 1;
+ text-align: center;
+}
+
+/* Select */
+
+div.selector {
+ position: relative;
+ padding-left: 10px;
+ overflow: hidden;
+}
+
+div.selector span {
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+div.selector select {
+ position: absolute;
+ opacity: 0;
+ filter: alpha(opacity:0);
+ height: 25px;
+ border: none;
+ background: none;
+}
+
+/* Checker */
+
+div.checker {
+ position: relative;
+}
+
+div.checker span {
+ display: -moz-inline-box;
+ display: inline-block;
+ text-align: center;
+}
+
+div.checker input {
+ opacity: 0;
+ filter: alpha(opacity:0);
+ display: inline-block;
+ background: none;
+}
+
+/* Radio */
+
+div.radio {
+ position: relative;
+}
+
+div.radio span {
+ display: -moz-inline-box;
+ display: inline-block;
+ text-align: center;
+}
+
+div.radio input {
+ opacity: 0;
+ filter: alpha(opacity:0);
+ text-align: center;
+ display: inline-block;
+ background: none;
+}
+
+/* Uploader */
+
+div.uploader {
+ position: relative;
+ overflow: hidden;
+ cursor: default;
+}
+
+div.uploader span.action {
+ float: left;
+ display: inline;
+ padding: 2px 0px;
+ overflow: hidden;
+ cursor: pointer;
+}
+
+div.uploader span.filename {
+ padding: 0px 10px;
+ float: left;
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ cursor: default;
+}
+
+div.uploader input {
+ opacity: 0;
+ filter: alpha(opacity:0);
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ float: right;
+ height: 25px;
+ border: none;
+ cursor: default;
+}
\ No newline at end of file
Modified: trunk/catalog/includes/classes/split_page_results.php
===================================================================
--- trunk/catalog/includes/classes/split_page_results.php 2012-07-15 14:27:02 UTC (rev 4520)
+++ trunk/catalog/includes/classes/split_page_results.php 2012-07-15 16:34:36 UTC (rev 4521)
@@ -84,7 +84,7 @@
// display split-page-number-links
function display_links($max_page_links, $parameters = '') {
- global $request_type;
+ global $request_type, $languages_id;
$display_links_string = '';
if (tep_not_null($parameters) && (substr($parameters, -1) != '&')) $parameters .= '&';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
