-
+ |
" />
|
Index: trunk/themes/default2007/platform/elements/side_boxes/search.tpl
===================================================================
diff -u -r8770 -r8771
--- trunk/themes/default2007/platform/elements/side_boxes/search.tpl (.../search.tpl) (revision 8770)
+++ trunk/themes/default2007/platform/elements/side_boxes/search.tpl (.../search.tpl) (revision 8771)
@@ -2,22 +2,22 @@
-">
+">
-
+
- img/s.gif" alt="" width="1" height="10" border="0" />
+
+ !" />
+
+
\ No newline at end of file
Index: trunk/core/units/images/images_config.php
===================================================================
diff -u -r8686 -r8771
--- trunk/core/units/images/images_config.php (.../images_config.php) (revision 8686)
+++ trunk/core/units/images/images_config.php (.../images_config.php) (revision 8771)
@@ -6,6 +6,7 @@
'l-img' => Array('ParentPrefix' => 'l'),
'n-img' => Array('ParentPrefix' => 'n'),
'bb-img'=> Array('ParentPrefix' => 'bb'),
+ 'bb-post-img'=> Array('ParentPrefix' => 'bb-post'),
/*'p-img' => Array('ParentPrefix' => 'p'),*/
'c-img' => Array('ParentPrefix' => 'c'),
),
Index: trunk/core/units/images/image_tag_processor.php
===================================================================
diff -u -r8705 -r8771
--- trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8705)
+++ trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8771)
@@ -145,11 +145,31 @@
return $ret;
}
+ /**
+ * Appends "/" to beginning of image path (in case when missing)
+ *
+ * @param kDBItem $object
+ * @todo old in-portal doesn't append first slash, but we do => append first slash for him :)
+ */
+ function makeRelativePaths(&$object)
+ {
+ $thumb_path = $object->GetDBField('ThumbPath');
+ if ($thumb_path && substr($thumb_path, 0, 1) != '/') {
+ $object->SetDBField('ThumbPath', '/'.$thumb_path);
+ }
+
+ $local_path = $object->GetDBField('LocalPath');
+ if ($local_path && substr($local_path, 0, 1) != '/') {
+ $object->SetDBField('LocalPath', '/'.$local_path);
+ }
+ }
+
function ImageSrc($params)
{
$object =& $this->getObject($params);
- $base_url = rtrim($this->Application->BaseURL(), '/');
+ $this->makeRelativePaths($object);
+ $base_url = rtrim($this->Application->BaseURL(), '/');
if ($object->GetDBField('SameImages') && $object->GetDBField('ThumbPath')) {
// we can auto-resize image, when source image available & we use same image for thumbnail & full image in admin
Index: trunk/themes/default2007/platform/my_account/my_favorites.tpl
===================================================================
diff -u -r8620 -r8771
--- trunk/themes/default2007/platform/my_account/my_favorites.tpl (.../my_favorites.tpl) (revision 8620)
+++ trunk/themes/default2007/platform/my_account/my_favorites.tpl (.../my_favorites.tpl) (revision 8771)
@@ -7,25 +7,11 @@
design="blue_box"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Index: trunk/kernel/units/images/image_tag_processor.php
===================================================================
diff -u -r8705 -r8771
--- trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8705)
+++ trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8771)
@@ -145,11 +145,31 @@
return $ret;
}
+ /**
+ * Appends "/" to beginning of image path (in case when missing)
+ *
+ * @param kDBItem $object
+ * @todo old in-portal doesn't append first slash, but we do => append first slash for him :)
+ */
+ function makeRelativePaths(&$object)
+ {
+ $thumb_path = $object->GetDBField('ThumbPath');
+ if ($thumb_path && substr($thumb_path, 0, 1) != '/') {
+ $object->SetDBField('ThumbPath', '/'.$thumb_path);
+ }
+
+ $local_path = $object->GetDBField('LocalPath');
+ if ($local_path && substr($local_path, 0, 1) != '/') {
+ $object->SetDBField('LocalPath', '/'.$local_path);
+ }
+ }
+
function ImageSrc($params)
{
$object =& $this->getObject($params);
- $base_url = rtrim($this->Application->BaseURL(), '/');
+ $this->makeRelativePaths($object);
+ $base_url = rtrim($this->Application->BaseURL(), '/');
if ($object->GetDBField('SameImages') && $object->GetDBField('ThumbPath')) {
// we can auto-resize image, when source image available & we use same image for thumbnail & full image in admin
Index: trunk/kernel/units/images/images_config.php
===================================================================
diff -u -r8686 -r8771
--- trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 8686)
+++ trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 8771)
@@ -6,6 +6,7 @@
'l-img' => Array('ParentPrefix' => 'l'),
'n-img' => Array('ParentPrefix' => 'n'),
'bb-img'=> Array('ParentPrefix' => 'bb'),
+ 'bb-post-img'=> Array('ParentPrefix' => 'bb-post'),
/*'p-img' => Array('ParentPrefix' => 'p'),*/
'c-img' => Array('ParentPrefix' => 'c'),
),
Index: trunk/themes/default2007/platform/inc/styles.css
===================================================================
diff -u -r8737 -r8771
--- trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8737)
+++ trunk/themes/default2007/platform/inc/styles.css (.../styles.css) (revision 8771)
@@ -181,7 +181,7 @@
font-size:9px;
}
-.paddnig-right
+.padding-right
{
padding-right:8px;
}
@@ -358,12 +358,12 @@
color:#000000;
text-decoration:none;
}
-
+
.image-padding-cell
{
padding-right:10px;
}
-
+
.subtitle-small-grey
{
background:#ebebeb;
@@ -373,33 +373,33 @@
font-size:10px;
color:#666666;
}
-
+
.price-msrp
{
text-decoration:line-through;
}
-
-
+
+
.price-red
{
color:#b70001;
font-size:13px;
font-weight:bold;
}
-
+
.red
{
color:#b70001;
}
-
+
.red-big
{
color:#b70001;
font-size:13px;
font-weight:bold;
}
-
-
+
+
.subtitle-small-blue
{
background:#dde7f1;
@@ -409,19 +409,19 @@
font-size:10px;
color:#165a9b;
}
-
+
.blue-title
{
color:#335c9e;
font-weight:bold;
font-size:12px;
}
-
+
a.black-link
{
color:#000000;
}
-
+
.item-cell-padding
{
padding:8px;
@@ -456,15 +456,15 @@
font-weight:bold;
padding:5px 15px;
font-size:12px;
- }
-
+ }
+
.subheaders-grey
{
background:#f4f4f4;
font-weight:bold;
padding:5px 15px;
font-size:12px;
- }
+ }
.pagenation-select
{
Index: trunk/core/units/general/cat_tag_processor.php
===================================================================
diff -u -r8757 -r8771
--- trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8757)
+++ trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8771)
@@ -277,22 +277,22 @@
function IsFavorite($params)
{
- static $favorite_status = null;
+ static $favorite_status = Array ();
$object =& $this->getObject($params);
/* @var $object kDBList */
- if (!isset($favorite_status)) {
+ if (!isset($favorite_status[$this->Special])) {
$resource_ids = $object->GetCol('ResourceId');
$user_id = $this->Application->RecallVar('user_id');
$sql = 'SELECT FavoriteId, ResourceId
FROM '.$this->Application->getUnitOption('fav', 'TableName').'
WHERE (PortalUserId = '.$user_id.') AND (ResourceId IN ('.implode(',', $resource_ids).'))';
- $favorite_status = $this->Conn->GetCol($sql, 'ResourceId');
+ $favorite_status[$this->Special] = $this->Conn->GetCol($sql, 'ResourceId');
}
- return isset($favorite_status[$object->GetDBField('ResourceId')]);
+ return isset($favorite_status[$this->Special][$object->GetDBField('ResourceId')]);
}
/**
|