[merlot] push by esar...@gmail.com - Fixed references to resources in JS after we moved to use Fanstatic. on 2011-04-03 23:24 GMT

[mer...@googlecode.com]

Revision: 552ef0f98db5
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Apr 3 16:23:56 2011
Log: Fixed references to resources in JS after we moved to use
Fanstatic.
http://code.google.com/p/merlot/source/detail?r=552ef0f98db5

Modified:
/merlot/static/merlot.js
/merlot/static/quicklog.js

=======================================
--- /merlot/static/merlot.js Wed Mar 23 23:51:59 2011
+++ /merlot/static/merlot.js Sun Apr 3 16:23:56 2011
@@ -18,7 +18,7 @@
if (preset_ranges_from_to.length){
//we have to create the little calendar icon on the right
preset_ranges_from_to.each(function(){
- icon = '<img class="calendar-icon ui-datepicker-trigger"
src="/@@/merlot/images/calendar.gif"/>';
+ icon = '<img class="calendar-icon ui-datepicker-trigger"
src="/fanstatic/merlot/images/calendar.gif"/>';
$(this).after(icon);
});
preset_ranges_from_to.daterangepicker({
@@ -47,7 +47,7 @@
if (only_ranged_star_end.length) {
//we have to create the little calendar icon on the right
only_ranged_star_end.each(function(){
- icon = '<img class="calendar-icon ui-datepicker-trigger"
src="/@@/merlot/images/calendar.gif"/>';
+ icon = '<img class="calendar-icon ui-datepicker-trigger"
src="/fanstatic/merlot/images/calendar.gif"/>';
$(this).after(icon);
});
only_ranged_star_end.daterangepicker({
=======================================
--- /merlot/static/quicklog.js Wed Mar 23 23:51:59 2011
+++ /merlot/static/quicklog.js Sun Apr 3 16:23:56 2011
@@ -3,9 +3,9 @@

//lets create a basic structure for the tooltip in the loglinks
var log_tooltip = $('<div class="tooltip log-row">'+
- '<a class="delete"><img
alt="'+merlot.i18n.DELETE_I18N+'"src="/@@/merlot/images/close.png"></a>'+
+ '<a class="delete"><img
alt="'+merlot.i18n.DELETE_I18N+'"src="/fanstatic/merlot/images/close.png"></a>'+
'<div class="ajax-load">'+
- '<img alt="ajax-load"
src="/@@/merlot/images/ajax-load.gif">'+
+ '<img alt="ajax-load"
src="/fanstatic/merlot/images/ajax-load.gif">'+
'</div>'+
'<div class="log-form-container"></div>'+
'</div>');
@@ -66,7 +66,7 @@
$("#form\\.date", log_row).datepicker({
"dateFormat": dateFormat,
"showOn": "button",
- "buttonImage": "/@@/merlot/images/calendar.gif",
+ "buttonImage": "/fanstatic/merlot/images/calendar.gif",
"buttonImageOnly": true,
"constrainInput": false
});
@@ -86,7 +86,7 @@
success: function(data){
row.empty();
row.append('<div class="success">'+
- '<h3><img alt="success" class="success"
src="/@@/merlot/images/check.png">'+merlot.i18n.SUCCESS_I18N+'</h3>'+
+ '<h3><img alt="success" class="success"
src="/fanstatic/merlot/images/check.png">'+merlot.i18n.SUCCESS_I18N+'</h3>'+
'<a class="more-logs"
href="#">'+merlot.i18n.MORE_I18N+'?</a>'+
'</div>');
$('.success', row).hide().fadeIn('slow');