Page MenuHomeIn-Portal Phabricator
Files F1092490

in-portal
No OneTemporary
Actions

File Metadata

Created
Sun, Aug 10, 11:11 AM

in-portal
View Options

Index: branches/unlabeled/unlabeled-1.2.20/core/admin_templates/js/colorselector.js
===================================================================
--- branches/unlabeled/unlabeled-1.2.20/core/admin_templates/js/colorselector.js (revision 3028)
+++ branches/unlabeled/unlabeled-1.2.20/core/admin_templates/js/colorselector.js (revision 3029)
@@ -1,104 +1,104 @@
- // color Selector
-
- var aColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF';
- var $color_selector_field = '';
-
- function InitColorSelector()
- {
- var $selector = document.getElementById('colorSelector_div');
-
- if( !isset($selector) )
- {
- var $selector = document.createElement('DIV');
- $selector.id = 'colorSelector_div';
- $selector.className = 'table_color1';
- $selector.style.width = '178px';
- $selector.style.borderWidth = '1px';
- $selector.style.borderColor = '#000000';
- $selector.style.display = 'none';
- $selector.style.position = 'absolute';
- $selector.style.borderStyle = 'solid';
-
- var $s_table = document.createElement('TABLE');
- $s_table.id = 'colorSelector';
- $selector.appendChild($s_table);
- document.body.appendChild($selector);
-
- var oTable = document.getElementById('colorSelector');
- var iCounter = 0;
- aColors = aColors.split(',');
-
- while(iCounter < aColors.length)
- {
- var oRow = oTable.insertRow(-1);
- for(var i = 0; i < 8 && iCounter < aColors.length; i++, iCounter++)
- {
- var $cell = document.createElement('TD');
- $cell.innerHTML = '<div class="ColorBox" style="background-color: #'+aColors[iCounter]+'"></div>';
- $cell.onmouseover = this.colorMouseOver;
- $cell.onmouseout = this.colorMouseOut;
- $cell.onclick = this.colorClick;
- $cell.setAttribute('ColorIndex', iCounter);
- var oDiv=oRow.insertCell(-1).appendChild($cell);
- };
- }
- }
- }
-
- function updateColor($event,$color_id)
- {
- document.getElementById('color_'+$color_id).style.backgroundColor = document.getElementById($color_id).value;
- }
-
- function colorMouseOver($e)
- {
- if(!$e) $e = window.event;
- //print_pre(this);
- this.parentNode.style.backgroundColor = '#C8D3E2';
- this.parentNode.style.borderColor = '#7196CC';
-
- }
-
- function colorMouseOut($e, $element)
- {
- if(!$e) $e = window.event;
- if(!$element) $element = this;
- $element.parentNode.style.backgroundColor = '#F6F6F6';
- $element.parentNode.style.borderColor = '#F6F6F6';
- }
-
- function colorClick($e)
- {
- if(!$e) $e = window.event;
- var $color = aColors[ this.getAttribute('ColorIndex') ];
-
- document.getElementById('color_'+$color_selector_field).style.backgroundColor = $color;
- document.getElementById($color_selector_field).value = '#' + $color;
- document.getElementById('colorSelector_div').style.display = 'none';
-
- colorMouseOut($e, this);
- }
-
- function openColorSelector($e, $field)
- {
- $color_selector_field = $field;
- var $div = document.getElementById('colorSelector_div');
-
- var posx = 0;
- var posy = 0;
- if (!$e) var $e = window.event;
- if ($e.pageX || $e.pageY)
- {
- posx = $e.pageX;
- posy = $e.pageY;
- }
- else if ($e.clientX || $e.clientY)
- {
- posx = $e.clientX + document.body.scrollLeft;
- posy = $e.clientY + document.body.scrollTop;
- }
-
- $div.style.left = posx;
- $div.style.top = posy;
- $div.style.display = 'block';
- }
+ // color Selector
+
+ var aColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF';
+ var $color_selector_field = '';
+
+ function InitColorSelector()
+ {
+ var $selector = document.getElementById('colorSelector_div');
+
+ if( !isset($selector) )
+ {
+ var $selector = document.createElement('DIV');
+ $selector.id = 'colorSelector_div';
+ $selector.className = 'table_color1';
+ $selector.style.width = '178px';
+ $selector.style.borderWidth = '1px';
+ $selector.style.borderColor = '#000000';
+ $selector.style.display = 'none';
+ $selector.style.position = 'absolute';
+ $selector.style.borderStyle = 'solid';
+
+ var $s_table = document.createElement('TABLE');
+ $s_table.id = 'colorSelector';
+ $selector.appendChild($s_table);
+ document.body.appendChild($selector);
+
+ var oTable = document.getElementById('colorSelector');
+ var iCounter = 0;
+ aColors = aColors.split(',');
+
+ while(iCounter < aColors.length)
+ {
+ var oRow = oTable.insertRow(-1);
+ for(var i = 0; i < 8 && iCounter < aColors.length; i++, iCounter++)
+ {
+ var $cell = document.createElement('TD');
+ $cell.innerHTML = '<div class="ColorBox" style="background-color: #'+aColors[iCounter]+'"></div>';
+ $cell.onmouseover = this.colorMouseOver;
+ $cell.onmouseout = this.colorMouseOut;
+ $cell.onclick = this.colorClick;
+ $cell.setAttribute('ColorIndex', iCounter);
+ var oDiv=oRow.insertCell(-1).appendChild($cell);
+ };
+ }
+ }
+ }
+
+ function updateColor($event,$color_id)
+ {
+ document.getElementById('color_'+$color_id).style.backgroundColor = document.getElementById($color_id).value;
+ }
+
+ function colorMouseOver($e)
+ {
+ if(!$e) $e = window.event;
+ //print_pre(this);
+ this.parentNode.style.backgroundColor = '#C8D3E2';
+ this.parentNode.style.borderColor = '#7196CC';
+
+ }
+
+ function colorMouseOut($e, $element)
+ {
+ if(!$e) $e = window.event;
+ if(!$element) $element = this;
+ $element.parentNode.style.backgroundColor = '#F6F6F6';
+ $element.parentNode.style.borderColor = '#F6F6F6';
+ }
+
+ function colorClick($e)
+ {
+ if(!$e) $e = window.event;
+ var $color = aColors[ this.getAttribute('ColorIndex') ];
+
+ document.getElementById('color_'+$color_selector_field).style.backgroundColor = $color;
+ document.getElementById($color_selector_field).value = '#' + $color;
+ document.getElementById('colorSelector_div').style.display = 'none';
+
+ colorMouseOut($e, this);
+ }
+
+ function openColorSelector($e, $field)
+ {
+ $color_selector_field = $field;
+ var $div = document.getElementById('colorSelector_div');
+
+ var posx = 0;
+ var posy = 0;
+ if (!$e) var $e = window.event;
+ if ($e.pageX || $e.pageY)
+ {
+ posx = $e.pageX;
+ posy = $e.pageY;
+ }
+ else if ($e.clientX || $e.clientY)
+ {
+ posx = $e.clientX + document.body.scrollLeft;
+ posy = $e.clientY + document.body.scrollTop;
+ }
+
+ $div.style.left = posx;
+ $div.style.top = posy;
+ $div.style.display = 'block';
+ }
Property changes on: branches/unlabeled/unlabeled-1.2.20/core/admin_templates/js/colorselector.js
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.2.20.1
\ No newline at end of property
Index: branches/unlabeled/unlabeled-1.18.2/core/units/visits/visits_config.php
===================================================================
--- branches/unlabeled/unlabeled-1.18.2/core/units/visits/visits_config.php (revision 3028)
+++ branches/unlabeled/unlabeled-1.18.2/core/units/visits/visits_config.php (revision 3029)
@@ -1,116 +1,115 @@
<?php
$config = Array(
'Prefix' => 'visits',
'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
'EventHandlerClass' => Array('class'=>'VisitsEventHandler','file'=>'visits_event_handler.php','build_event'=>'OnBuild'),
'TagProcessorClass' => Array('class'=>'VisitsTagProcessor','file'=>'visits_tag_processor.php','build_event'=>'OnBuild'),
'AutoLoad' => true,
'QueryString' => Array(
1 => 'id',
2 => 'Page',
3 => 'event',
4 => 'mode',
),
'IDField' => 'VisitId',
'TableName' => TABLE_PREFIX.'Visits',
'TitlePresets' => Array(
- 'default' => Array( ),
- 'visits_list' => Array( 'prefixes' => Array('visits_List'),
- 'format' => "!la_title_Visits! (#visits_recordcount#)",
- ),
- ),
+ 'default' => Array(),
+ 'visits_list' => Array('prefixes' => Array('visits_List'), 'format' => "!la_title_Visits! (#visits_recordcount#)"),
+ 'visits.incommerce_list' => Array('prefixes' => Array('visits.incommerce_List'), 'format' => "!la_title_Visits! (#visits.incommerce_recordcount#)"),
+ ),
'CalculatedFields' => Array(
'' => Array (
'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
),
'incommerce' => Array (
'UserName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), u.Login)',
'AffiliateUser' => 'IF( LENGTH(au.Login),au.Login,\'!la_None!\')',
'AffiliatePortalUserId' => 'af.PortalUserId',
'OrderTotalAmount' => 'IF(ord.Status = 4, ord.SubTotal+ord.ShippingCost+ord.VAT, 0)',
'OrderAffiliateCommission' => 'IF(ord.Status = 4, ord.AffiliateCommission, 0)',
'OrderNumber' => 'CONCAT(LPAD(Number,6,0),\'-\',LPAD(SubNumber,3,0) )',
'OrderId' => 'ord.OrderId',
),
),
'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId',
'incommerce'=>' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
),
'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId',
'incommerce'=>' SELECT %1$s.* %2$s
FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId
LEFT JOIN '.TABLE_PREFIX.'Affiliates af ON %1$s.AffiliateId = af.AffiliateId
LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId
LEFT JOIN '.TABLE_PREFIX.'Orders ord ON %1$s.VisitId = ord.VisitId',
),
'ListSortings' => Array(
'' => Array(
'Sorting' => Array('VisitDate' => 'desc'),
)
),
'Fields' => Array(
'VisitId' => Array('type' => 'int'),
'VisitDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'custom_filter' => 'date_range', 'not_null' => '1','default' => '0'),
'Referer' => Array('type' => 'string','not_null' => '1','default' => ''),
'IPAddress' => Array('type' => 'string','not_null' => '1','default' => ''),
'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter','options'=>Array(0=>'lu_none'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0),
'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => -2),
),
'VirtualFields' => Array(
'UserName' => Array('type'=>'string'),
'AffiliateUser' => Array('type'=>'string'),
'AffiliatePortalUserId' => Array('type'=>'int'),
'OrderTotalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00', 'totals' => 'SUM'),
'OrderTotalAmountSum' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'),
'OrderAffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000', 'totals' => 'SUM'),
'OrderAffiliateCommissionSum' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'),
'OrderId' => Array('type' => 'int', 'default' => '0'),
),
'Grids' => Array(
'Default' => Array(
'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array(
'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
'IPAddress' => Array( 'title'=>'la_col_IPAddress' ),
'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
),
),
'visitsincommerce' => Array(
'Icons' => Array('default'=>'icon16_custom.gif'), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used
'Fields' => Array(
'VisitDate' => Array( 'title'=>'la_col_VisitDate', 'data_block' => 'grid_checkbox_td' ),
'IPAddress' => Array( 'title'=>'la_col_IPAddress' ),
'Referer' => Array( 'title'=>'la_col_Referer', 'data_block' => 'grid_referer_td' ),
'UserName' => Array('title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId'),
'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId'),
'OrderTotalAmountSum' => Array( 'title' => 'la_col_OrderTotal'),
'OrderAffiliateCommissionSum' => Array( 'title' => 'la_col_Commission'),
),
),
),
);
?>
\ No newline at end of file
Property changes on: branches/unlabeled/unlabeled-1.18.2/core/units/visits/visits_config.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.18.2.1
\ No newline at end of property

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server