diff options
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | js/main.js | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/img/jslider.png | bin | 0 -> 1021 bytes | |||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 7 | ||||
| -rw-r--r-- | view/tpl/main_slider.tpl | 4 |
7 files changed, 10 insertions, 9 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index cb79c180c..6f9eaa18e 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -154,7 +154,7 @@ class Item extends BaseObject { } $showlike = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); - $showdislike = ((x($dlike,$item['uri']) && feature_enabled($conv->get_profile_owner(),'dislike')) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); + $showdislike = ((x($dlike,$item['uri']) && feature_enabled($conv->get_profile_owner(),'dislike')) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : ''); /* * We should avoid doing this all the time, but it depends on the conversation mode diff --git a/include/conversation.php b/include/conversation.php index ecd6d358e..56bcef559 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -650,7 +650,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { // Can we put this after the visibility check? like_puller($a,$item,$alike,'like'); - if(feature_enabled($profile_uid,'dislike')) + if(feature_enabled($profile_owner,'dislike')) like_puller($a,$item,$dlike,'dislike'); // Only add what is visible diff --git a/js/main.js b/js/main.js index b184cd429..67105bd16 100644 --- a/js/main.js +++ b/js/main.js @@ -493,6 +493,8 @@ function updateConvItems(mode,data) { in_progress = false; updateConvItems(update_mode,data); $("#page-spinner").hide(); + $("#profile-jot-text-loading").hide(); + }); diff --git a/version.inc b/version.inc index 9dde64255..19d7676b1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-01-05.191 +2013-01-06.192 diff --git a/view/img/jslider.png b/view/img/jslider.png Binary files differnew file mode 100644 index 000000000..12d26ccad --- /dev/null +++ b/view/img/jslider.png diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1d191b4a7..97d5f440e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3534,13 +3534,12 @@ div.jGrowl div.info { text-align: center; } -/* -Leave this here for now just in case, but this is what's breaking the slider .jslider .jslider-bg, .jslider .jslider-pointer { - background: url("../img/slider.png") !important; -}*/ + background: url("../../../img/jslider.png") !important; +} + .slider { margin-top: 10px; diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index ea8b04cf3..662677684 100644 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -2,8 +2,8 @@ <script> $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { var carr = v.split(";"); - network_cmin = carr[0]; - network_cmax = carr[1]; + bParam_cmin = carr[0]; + bParam_cmax = carr[1]; networkRefresh(); } }); |
