[jobberbase] r422 committed - fixed: the icons and tooltips for spotlight activate/deactivate were s...

[codesite...@google.com]

Revision: 422
Author: putyp...@gmail.com
Date: Sat Feb 6 11:47:22 2010
Log: fixed: the icons and tooltips for spotlight activate/deactivate were
shown for the opposite state
fixed: removed useless (and wrong) is_first_page parameter from the
SpotlightActivate JS method
http://code.google.com/p/jobberbase/source/detail?r=422

Modified:
/trunk/public/admin/_templates/js/functions.js
/trunk/public/admin/_templates/posts-loop.tpl

=======================================
--- /trunk/public/admin/_templates/js/functions.js Fri Feb 5 15:15:39 2010
+++ /trunk/public/admin/_templates/js/functions.js Sat Feb 6 11:47:22 2010
@@ -132,9 +132,9 @@
ActivateSpotlight: function(job_id)
{
var url = Jobber.jobber_admin_url+'activate-spotlight/';
- Jobber.SpotlightActivate(url, job_id, 0);
+ Jobber.SpotlightActivate(url, job_id);
},
- SpotlightActivate: function(url, job_id, is_first_page)
+ SpotlightActivate: function(url, job_id)
{
$.ajax({
type: "POST",
@@ -143,26 +143,19 @@
success: function(msg) {
if (msg != "0")
{
- var currentRowId = 'item'+job_id;
var currentLinkId = 'activateSpotlight'+job_id;
- if(is_first_page == 1)
- {
- $("#"+currentRowId).css({ display: "none" });
- }
- else
- {
- var deactivateSpotlightFunction = function()
- {
- Jobber.DeactivateSpotlight(job_id);
- };
-
- var linkElement = document.getElementById(currentLinkId);
- linkElement.setAttribute('title', 'Turn spotlight on');
- linkElement.setAttribute('onclick',
deactivateSpotlightFunction);
- linkElement.onclick =
deactivateSpotlightFunction;
- linkElement.innerHTML = '<img
src="'+Jobber.jobber_admin_url+'_templates/img/star_off.png"
alt="deactivate" />';
- linkElement.id = 'deactivateSpotlight'+job_id;
- }
+
+ var deactivateSpotlightFunction = function()
+ {
+ Jobber.DeactivateSpotlight(job_id);
+ };
+
+ var linkElement = document.getElementById(currentLinkId);
+ linkElement.setAttribute('title', 'Turn spotlight off');
+ linkElement.setAttribute('onclick',
deactivateSpotlightFunction);
+ linkElement.onclick = deactivateSpotlightFunction;
+ linkElement.innerHTML = '<img
src="'+Jobber.jobber_admin_url+'_templates/img/star_on.png"
alt="deactivate" />';
+ linkElement.id = 'deactivateSpotlight'+job_id;
}
}
});
@@ -184,10 +177,10 @@
};

var linkElement = document.getElementById(currentLinkId);
- linkElement.setAttribute('title', 'Turn spotlight off');
+ linkElement.setAttribute('title', 'Turn spotlight on');
linkElement.setAttribute('onclick',
activateSpotlightFunction);
linkElement.onclick = activateSpotlightFunction;
- linkElement.innerHTML = '<img
src="'+Jobber.jobber_admin_url+'_templates/img/star_on.png" alt="activate"
/>';
+ linkElement.innerHTML = '<img
src="'+Jobber.jobber_admin_url+'_templates/img/star_off.png" alt="activate"
/>';
linkElement.id = 'activateSpotlight'+job_id;
}
}
=======================================
--- /trunk/public/admin/_templates/posts-loop.tpl Fri Feb 5 15:15:39 2010
+++ /trunk/public/admin/_templates/posts-loop.tpl Sat Feb 6 11:47:22 2010
@@ -7,9 +7,9 @@
<div class="icons">
<a href="{$BASE_URL_ADMIN}edit-post/{$job.id}/" title="Edit this
job"><img src="{$BASE_URL_ADMIN}_templates/img/pencil.png" alt="edit" /></a>
{if $job.is_spotlight == 0}
- <a id="activateSpotlight{$job.id}" href="javascript:void(0);"
onclick="Jobber.SpotlightActivate('{$BASE_URL_ADMIN}activate-spotlight/',
{$job.id}, {if $CURRENT_PAGE == ''}1{else}0{/if});" title="Turn spotlight
on"><img src="{$BASE_URL_ADMIN}_templates/img/star_on.png" alt="activate"
/></a>
+ <a id="activateSpotlight{$job.id}" href="javascript:void(0);"
onclick="Jobber.SpotlightActivate('{$BASE_URL_ADMIN}activate-spotlight/',
{$job.id});" title="Turn spotlight on"><img
src="{$BASE_URL_ADMIN}_templates/img/star_off.png" alt="activate" /></a>
{else}
- <a id="deactivateSpotlight{$job.id}" href="javascript:void(0);"
onclick="Jobber.SpotlightDeactivate('{$BASE_URL_ADMIN}deactivate-spotlight/',
{$job.id});" title="Turn spotlight on"><img
src="{$BASE_URL_ADMIN}_templates/img/star_off.png" alt="deactivate" /></a>
+ <a id="deactivateSpotlight{$job.id}" href="javascript:void(0);"
onclick="Jobber.SpotlightDeactivate('{$BASE_URL_ADMIN}deactivate-spotlight/',
{$job.id});" title="Turn spotlight off"><img
src="{$BASE_URL_ADMIN}_templates/img/star_on.png" alt="deactivate" /></a>
{/if}&nbsp;
{if $job.is_active == 0}
<a id="activateLink{$job.id}" href="javascript:void(0);"
onclick="Jobber.Activate('{$BASE_URL_ADMIN}activate/', {$job.id}, {if
$CURRENT_PAGE == ''}1{else}0{/if});" title="Active this job"><img
src="{$BASE_URL_ADMIN}_templates/img/switch_off.png" alt="activate" /></a>