--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Mon Feb 28 12:43:13 2011 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Wed Mar 02 15:31:44 2011 +0100
@@ -7,11 +7,12 @@
<meta http-equiv="Expires" content="-1" />
<title>Ligne de Temps - IRI</title>
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/swfobject.js"></script>
+<!--script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/jquery.min.js"></script>
+<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}/js/jquery.nyroModal.min.js"></script-->
<script type="text/javascript">
<!--
function ldtSaveOk() {
- //alert("LDT a fini sa sauvegarde");
- parent.forceModalClose();
+ parent.$.nmTop().close(true);
}
-->
</script>
--- a/src/ldt/ldt/media/css/nyroModal.css Mon Feb 28 12:43:13 2011 +0100
+++ b/src/ldt/ldt/media/css/nyroModal.css Wed Mar 02 15:31:44 2011 +0100
@@ -17,7 +17,7 @@
width: 12px;
height: 12px;
text-indent: -9999em;
- background: url(../img/close.png);
+ background: url(../img/close_nm.gif);
}
.nyroModalTitle {
top: -26px;
@@ -66,7 +66,7 @@
position: absolute;
width: 100px;
height: 100px;
- background: #fff url(../img/ajaxLoader.gif) no-repeat center;
+ background: #fff url(../img/ajax-loader-43x43.gif) no-repeat center;
padding: 0;
}
.nyroModalPrev, .nyroModalNext {
Binary file src/ldt/ldt/media/img/close_nm.gif has changed
Binary file src/ldt/ldt/media/img/next.gif has changed
Binary file src/ldt/ldt/media/img/prev.gif has changed
--- a/src/ldt/ldt/media/js/projectscontents.js Mon Feb 28 12:43:13 2011 +0100
+++ b/src/ldt/ldt/media/js/projectscontents.js Wed Mar 02 15:31:44 2011 +0100
@@ -1,402 +1,400 @@
$.fn.realVal = function() {
- var obj = $(this[0]);
- if(obj.val) {
- if(obj.val() == obj.attr('defaultText')) {
- return '';
- }
- else {
- return obj.val();
- }
- }
- else {
- return null;
- }
+ var obj = $(this[0]);
+ if(obj.val) {
+ if(obj.val() == obj.attr('defaultText')) {
+ return '';
+ }
+ else {
+ return obj.val();
+ }
+ }
+ else {
+ return null;
+ }
};
function init_events_base(base_node, embed_url) {
-
- $('.ldt_link_embed',base_node).click(function(e) {
- e.preventDefault();
- var link = $(e.target);
- var json_url = link.attr("href");
- var player_id = link.attr("id");
- var ldt_id = player_id.substring(15);
- $('<a />', {
- href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
- target: "_blank"
- }).nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: '750',
- minH: '662'
- },
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.height(662);
- nm.store.iframe.width(750);
- }
- }
- }).trigger('nyroModal');
- return false;
- });
+
+ $('.ldt_link_embed',base_node).click(function(e) {
+ e.preventDefault();
+ var link = $(e.target);
+ var json_url = link.attr("href");
+ var player_id = link.attr("id");
+ var ldt_id = player_id.substring(15);
+ $('<a />', {
+ href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
+ target: "_blank"
+ }).nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: '750',
+ minH: '662'
+ },
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(662);
+ nm.store.iframe.width(750);
+ }
+ }
+ }).trigger('nyroModal');
+ return false;
+ });
- $('.imageline',base_node).each(function(i) {
- var tr = $(this);
- tr.mouseover(function() {
- $('.cellimgdiv',this).css('visibility', 'visible');
- });
- tr.mouseout(function() {
- $('.cellimgdiv',this).css('visibility', 'hidden');
- });
- });
-
- $('.cellimgdiv img').qtip({
- style: {
- 'name': 'dark',
- 'filter':'alpha(opacity=70)',
- '-moz-opacity':'0.7',
- '-khtml-opacity': '0.7',
- 'opacity': '0.7',
- 'border': {
- 'width' : '0',
- 'color': '#505050'
- },
- 'tip': true
- }
- });
-
+ $('.imageline',base_node).each(function(i) {
+ var tr = $(this);
+ tr.mouseover(function() {
+ $('.cellimgdiv',this).css('visibility', 'visible');
+ });
+ tr.mouseout(function() {
+ $('.cellimgdiv',this).css('visibility', 'hidden');
+ });
+ });
+
+ $('.cellimgdiv img').qtip({
+ style: {
+ 'name': 'dark',
+ 'filter':'alpha(opacity=70)',
+ '-moz-opacity':'0.7',
+ '-khtml-opacity': '0.7',
+ 'opacity': '0.7',
+ 'border': {
+ 'width' : '0',
+ 'color': '#505050'
+ },
+ 'tip': true
+ }
+ });
+
};
-function testAndClose() {
- // Here we ask LDT if the current work is modified and if the user want to save it.
- var ldtSwf = $('#ldtInitSwf',$.nmTop().store.iframe.contents()).get(0);
- // In the ldt_link_create case, the modal page can be the form, or the ldt swf. So we have to test.
- if (ldtSwf) {
- if (ldtSwf.name=="ldtInitSwf") {
- if(ldtSwf.isModified()=="true") {
- //ldtSwf.forceSave();
- ldtSwf.askSave();
- }
- else{
- forceModalClose();
- }
- }
- else{
- forceModalClose();
- }
- }
- else{
- forceModalClose();
- }
+function testAndClose(old_close) {
+
+ return function(force) {
+ // Here we ask LDT if the current work is modified and if the user want to save it.
+ var ldtSwf = $('#ldtInitSwf',$.nmTop().store.iframe.contents()).get(0);
+ // In the ldt_link_create case, the modal page can be the form, or the ldt swf. So we have to test.
+ if (!force && ldtSwf && ldtSwf.name=="ldtInitSwf" && ldtSwf.isModified()=="true") {
+ ldtSwf.askSave();
+ }
+ else {
+ old_close.apply(this);
+ }
+ };
}
function searchCallback(target, container_selector, url, timeout) {
- timeout = typeof(timeout) != 'undefined' ? timeout : 0;
- var target = $(target);
-
- // remove all qtip
- $(".qtip").remove();
-
- if(target.realVal().length > 0) {
- target.nextAll(".searchclear").show();
- }
+ timeout = typeof(timeout) != 'undefined' ? timeout : 0;
+ var target = $(target);
+
+ // remove all qtip
+ $(".qtip").remove();
+
+ if(target.realVal().length > 0) {
+ target.nextAll(".searchclear").show();
+ }
- if(target.attr('timer')) {
- clearTimeout(target.attr('timer'));
- }
+ if(target.attr('timer')) {
+ clearTimeout(target.attr('timer'));
+ }
- target.attr(
- 'timer',
- setTimeout(function() {
- target.next(".searchajaxloader").show();
- target.nextAll(".searchclear").hide();
- var filterVal = "_" + escape(target.realVal());
- url = url.replace('__FILTER__',filterVal);
- $.ajax({
- url: url,
- cache: false,
- success: function(data, status, request) {
- $(container_selector).html(data);
- target.next(".searchajaxloader").hide();
- if(target.realVal().length > 0) {
- target.nextAll(".searchclear").show();
- }
- init_events($(container_selector));
- target.removeAttr('timer');
- }
- });
- },
- 300)
- );
+ target.attr(
+ 'timer',
+ setTimeout(function() {
+ target.next(".searchajaxloader").show();
+ target.nextAll(".searchclear").hide();
+ var filterVal = "_" + escape(target.realVal());
+ url = url.replace('__FILTER__',filterVal);
+ $.ajax({
+ url: url,
+ cache: false,
+ success: function(data, status, request) {
+ $(container_selector).html(data);
+ target.next(".searchajaxloader").hide();
+ if(target.realVal().length > 0) {
+ target.nextAll(".searchclear").show();
+ }
+ init_events($(container_selector));
+ target.removeAttr('timer');
+ }
+ });
+ },
+ 300)
+ );
};
function init_events_contents(base_node, embed_url, content_filter_url) {
- init_events_base(base_node, embed_url);
-
- $('.content_link_create').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.content_link_create').nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: 770,
- minH: 500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.width(770);
- nm.store.iframe.height(500);
- nm.store.iframe.load(function() {
- var form_status = $(this).contents().find("#content_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted' ) {
- $.nmTop().close();
- }
- });
- }
- }
- });
+ init_events_base(base_node, embed_url);
+
+ $('.content_link_create').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.content_link_create').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: 770,
+ minH: 500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(770);
+ nm.store.iframe.height(500);
+ nm.store.iframe.load(function() {
+ var form_status = $(this).contents().find("#content_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted' ) {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
- $('.contenttitlelink').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.contenttitlelink').nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: 770,
- minH: 500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.width(770);
- nm.store.iframe.height(500);
- nm.store.iframe.load(function() {
- var form_status = $(this).contents().find("#content_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted') {
- $.nmTop().close();
- }
- });
- }
- }
- });
+ $('.contenttitlelink').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.contenttitlelink').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: 770,
+ minH: 500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(770);
+ nm.store.iframe.height(500);
+ nm.store.iframe.load(function() {
+ var form_status = $(this).contents().find("#content_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted') {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
}
function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
- // These are the functions called when we display a project in an LDT modal window
- $('.ldt_link',base_node).each(function(i){
- $(this).attr("target","_iri");
- });
- $('.ldt_link',base_node).nyroModal({
- filters: ['iriIframe'],
- sizes: {
- minW: '1022',
- minH: '662'
- },
- showCloseButton: true,
- closeOnEscape:false,
- closeOnClick:false,
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.height(662);
- nm.store.iframe.width(1022);
- },
- close: function(nm) {
- // We don't do anything here, we hack the callback directly from the close function.
- },
- afterClose: function(nm) {
- // Can't do that because searchprojectfilterurl is not defined in init_events_base params
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- },
- close:function(nm){
- testAndClose();
- }
+ // These are the functions called when we display a project in an LDT modal window
+ $('.ldt_link',base_node).each(function(i){
+ $(this).attr("target","_iri");
});
+ $('.ldt_link',base_node).nyroModal({
+ filters: ['iriIframe'],
+ sizes: {
+ minW: '1022',
+ minH: '662'
+ },
+ showCloseButton: true,
+ closeOnEscape:false,
+ closeOnClick:false,
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(662);
+ nm.store.iframe.width(1022);
+ },
+ close: function(nm) {
+ // We don't do anything here, we hack the callback directly from the close function.
+ },
+ afterClose: function(nm) {
+ // Can't do that because searchprojectfilterurl is not defined in init_events_base params
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ },
+ });
+
+ $('.ldt_link',base_node).each(function(i, e) {
+ nm = $(e).data('nmObj');
+ $(e).data('nmObj', $.extend(true, nm, {
+ close: testAndClose(nm.close)
+ }));
+ });
- $('.ldt_link_create',base_node).each(function(i){
- $(this).attr("target","_iri");
- });
- $('.ldt_link_create',base_node).nyroModal({
-
- filters: ['iriIframe'],
- sizes: {
- minW: '600',
- minH: '500'
- },
- showCloseButton:true,
- closeOnEscape:false,
- closeOnClick:false,
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.width(600);
- nm.store.iframe.height(500);
- var iframe = nm.store.iframe;
- iframe.load(function(){
- var form_status = $(this).contents().find("#project_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted' ) {
- $.nmTop().close();
- }
- var swfobject = $(this).contents().find("#ldtInitSwf");
- if (swfobject.length) {
- nm['sizes']['initW'] = swfobject.width() + 21;
- nm['sizes']['initH'] = swfobject.height() + 31;
- nm.resize();
- nm.store.iframe.height(swfobject.height() + 31);
- nm.store.iframe.width(swfobject.width() + 21);
- }
- });
- },
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- },
- close:function(){
- testAndClose();
- }
-
+ $('.ldt_link_create',base_node).each(function(i){
+ $(this).attr("target","_iri");
+ });
+ $('.ldt_link_create',base_node).nyroModal({
+
+ filters: ['iriIframe'],
+ sizes: {
+ minW: '600',
+ minH: '500'
+ },
+ showCloseButton:true,
+ closeOnEscape:false,
+ closeOnClick:false,
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(600);
+ nm.store.iframe.height(500);
+ var iframe = nm.store.iframe;
+ iframe.load(function(){
+ var form_status = $(this).contents().find("#project_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted' ) {
+ $.nmTop().close();
+ }
+ var swfobject = $(this).contents().find("#ldtInitSwf");
+ if (swfobject.length) {
+ nm['sizes']['initW'] = swfobject.width() + 21;
+ nm['sizes']['initH'] = swfobject.height() + 31;
+ nm.resize();
+ nm.store.iframe.height(swfobject.height() + 31);
+ nm.store.iframe.width(swfobject.width() + 21);
+ }
+ });
+ },
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
+ $('.ldt_link_create',base_node).each(function(i, e) {
+ nm = $(e).data('nmObj');
+ $(e).data('nmObj', $.extend(true, nm, {
+ close: testAndClose(nm.close)
+ }));
+ });
+
+
+ $('.publishedproject', base_node).click(function(e) {
+ e.preventDefault();
+ var target = $(e.target);
+ var project_id = target.attr('id').replace('project_','');
+ var url = unpublishprojecturl.replace('__PROJECT_ID__', project_id);
+ $.ajax({
+ url: url,
+ type: 'POST',
+ dataType: 'json',
+ success: function(json, textStatus, XMLHttpRequest){
+ if(json.res) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
});
-
- $('.publishedproject', base_node).click(function(e) {
- e.preventDefault();
- var target = $(e.target);
- var project_id = target.attr('id').replace('project_','');
- var url = unpublishprojecturl.replace('__PROJECT_ID__', project_id);
- $.ajax({
- url: url,
- type: 'POST',
- dataType: 'json',
- success: function(json, textStatus, XMLHttpRequest){
- if(json.res) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- }
- });
- });
+ $('.unpublishedproject', base_node).click(function(e) {
+ e.preventDefault();
+ var target = $(e.target);
+ var project_id = target.attr('id').replace('project_','');
+ var url = publishprojecturl.replace('__PROJECT_ID__', project_id);
+ $.ajax({
+ url: url,
+ type: 'POST',
+ dataType: 'json',
+ success: function(json, textStatus, XMLHttpRequest){
+ if(json.res) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
+ });
- $('.unpublishedproject', base_node).click(function(e) {
- e.preventDefault();
- var target = $(e.target);
- var project_id = target.attr('id').replace('project_','');
- var url = publishprojecturl.replace('__PROJECT_ID__', project_id);
- $.ajax({
- url: url,
- type: 'POST',
- dataType: 'json',
- success: function(json, textStatus, XMLHttpRequest){
- if(json.res) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- }
- });
- });
-
- $('.projecttitlelink').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.projecttitlelink').nyroModal({
- filters: ['iframe'],
- sizes: {
- minH:680,
- minW:500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.height(680);
- nm.store.iframe.width(600);
- var iframe = nm.store.iframe;
- iframe.load(function(){
- var form_status = $(this).contents().find("#project_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted') {
- $.nmTop().close();
- }
- });
- }
- }
- });
-
+ $('.projecttitlelink').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.projecttitlelink').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minH:680,
+ minW:500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(680);
+ nm.store.iframe.width(600);
+ var iframe = nm.store.iframe;
+ iframe.load(function(){
+ var form_status = $(this).contents().find("#project_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted') {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
+
}
function init_events_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-
- init_events_base(base_node, embed_url);
- init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
+
+ init_events_base(base_node, embed_url);
+ init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
}
function init_events_all(base_node, embed_url, searchcontentfilterurl, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-
- init_events_contents(base_node, embed_url, searchcontentfilterurl);
- init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
+
+ init_events_contents(base_node, embed_url, searchcontentfilterurl);
+ init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
}
function searchFieldInit(input_list_init) {
- $(".searchfieldinputbase").keydown(function (e) {
- if(e.which == 27) {
- $(e.target).blur();
- $(e.target).next(".searchajaxloader").hide();
- }
- });
-
- $('.searchfieldinput').each(function(i) {
- var sbox = $(this);
- if(sbox.val() != '') {
- sbox.attr('defaultText', sbox.val());
- }
-
- sbox.focus(function() {
- box = $(this);
- if(box.val() == box.attr('defaultText')) {
- box.val('');
- box.toggleClass("searchfieldinput");
- }
- });
-
- sbox.blur(function() {
- var box = $(this);
- if(box.val() == '' && box.attr('defaultText')) {
- box.val(box.attr('defaultText'));
- box.toggleClass("searchfieldinput");
- }
- });
-
- });
+ $(".searchfieldinputbase").keydown(function (e) {
+ if(e.which == 27) {
+ $(e.target).blur();
+ $(e.target).next(".searchajaxloader").hide();
+ }
+ });
+
+ $('.searchfieldinput').each(function(i) {
+ var sbox = $(this);
+ if(sbox.val() != '') {
+ sbox.attr('defaultText', sbox.val());
+ }
+
+ sbox.focus(function() {
+ box = $(this);
+ if(box.val() == box.attr('defaultText')) {
+ box.val('');
+ box.toggleClass("searchfieldinput");
+ }
+ });
+
+ sbox.blur(function() {
+ var box = $(this);
+ if(box.val() == '' && box.attr('defaultText')) {
+ box.val(box.attr('defaultText'));
+ box.toggleClass("searchfieldinput");
+ }
+ });
+
+ });
- $.each(input_list_init, function(index, value) {
- $(value['input_selector']).keyup(function (e) {
- searchCallback(e.target, value['container_selector'], value['url']);
- });
- });
-
- $('.searchclear').click(function(e) {
- var box = $(e.target).parent().find("input");
- box.val(box.attr('defaultText'));
- box.addClass("searchfieldinput");
- box.blur();
- box.keyup();
- });
-
- $('.searchclear').each(function(i) {
- $(this).hide();
- });
+ $.each(input_list_init, function(index, value) {
+ $(value['input_selector']).keyup(function (e) {
+ searchCallback(e.target, value['container_selector'], value['url']);
+ });
+ });
+
+ $('.searchclear').click(function(e) {
+ var box = $(e.target).parent().find("input");
+ box.val(box.attr('defaultText'));
+ box.addClass("searchfieldinput");
+ box.blur();
+ box.keyup();
+ });
+
+ $('.searchclear').each(function(i) {
+ $(this).hide();
+ });
}
--- a/src/ldt/ldt/settings.py Mon Feb 28 12:43:13 2011 +0100
+++ b/src/ldt/ldt/settings.py Wed Mar 02 15:31:44 2011 +0100
@@ -1,5 +1,3 @@
-import os
-import os.path
import logging
from django.conf import settings
@@ -33,6 +31,7 @@
)
MIDDLEWARE_CLASSES = (
+ 'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Mon Feb 28 12:43:13 2011 +0100
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Wed Mar 02 15:31:44 2011 +0100
@@ -14,45 +14,7 @@
{% endblock %}
{% block js_declaration %}
- <script type="text/javascript">
-
- function forceModalClose()
- {
- // Since we hacked the close function to allow a last saving from LDT
- // We have to rebuild the close function for it to work properly
- $.nmTop().close = function(){
- // star hack this._close();
- this.getInternal()._removeStack(this.opener);
- this._opened=false;
- this._open=false;
- // end hack this._close();
- this._callFilters('beforeClose');
- var self=this;
- this._unreposition();
- self._callAnim('hideCont',function(){
- self._callAnim('hideLoad',function(){
- self._callAnim('hideBg',function(){
- self._callFilters('afterClose');
- self.elts.cont.remove();
- self.elts.hidden.remove();
- self.elts.load.remove();
- self.elts.bg.remove();
- self.elts.all.remove();
- self.elts.cont=self.elts.hidden=self.elts.load=self.elts.bg=self.elts.all=undefined;
- });
- });
- });
- // VERY IMPORTANT : WE REBUILD THE CLOSE COMMAND WITH THE TEST FOR THE NEXT TIME !
- this.close = function(){
- // function defined in projectscontents.js
- testAndClose();
- }
- }
- // We launch the close command
- $.nmTop().close();
-
- }
-
+ <script type="text/javascript">
jQuery(function($, undefined) {
$.nmFilters({iriIframe:{
@@ -119,9 +81,6 @@
</div>
{% endblock %}
</div>
-
- <p><a class="tibo_link" href="/pf/static/nimp.htm">jour bon</a></p>
-
<div id="content" class="span-24 last">
<div id="toolbar" class="span-24 last">
--- a/web/ldtplatform/settings.py Mon Feb 28 12:43:13 2011 +0100
+++ b/web/ldtplatform/settings.py Wed Mar 02 15:31:44 2011 +0100
@@ -73,7 +73,7 @@
)
MIDDLEWARE_CLASSES = (
- 'django.middleware.common.GZipMiddleware',
+ 'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
@@ -153,8 +153,8 @@
from config import *
-LOGIN_URL = BASE_URL + 'platform/accounts/login/'
-LOGOUT_URL = BASE_URL + 'platform/accounts/logout/'
+LOGIN_URL = BASE_URL + 'ldtplatform/accounts/login/'
+LOGOUT_URL = BASE_URL + 'ldtplatform/accounts/logout/'
LOGIN_REDIRECT_URL = BASE_URL + 'ldtplatform'
GLOBAL_LOG_LEVEL = LOG_LEVEL
--- a/web/static/ldt/css/nyroModal.css Mon Feb 28 12:43:13 2011 +0100
+++ b/web/static/ldt/css/nyroModal.css Wed Mar 02 15:31:44 2011 +0100
@@ -17,7 +17,7 @@
width: 12px;
height: 12px;
text-indent: -9999em;
- background: url(../img/close.png);
+ background: url(../img/close_nm.gif);
}
.nyroModalTitle {
top: -26px;
@@ -66,7 +66,7 @@
position: absolute;
width: 100px;
height: 100px;
- background: #fff url(../img/ajaxLoader.gif) no-repeat center;
+ background: #fff url(../img/ajax-loader-43x43.gif) no-repeat center;
padding: 0;
}
.nyroModalPrev, .nyroModalNext {
Binary file web/static/ldt/img/close_nm.gif has changed
Binary file web/static/ldt/img/next.gif has changed
Binary file web/static/ldt/img/prev.gif has changed
--- a/web/static/ldt/js/projectscontents.js Mon Feb 28 12:43:13 2011 +0100
+++ b/web/static/ldt/js/projectscontents.js Wed Mar 02 15:31:44 2011 +0100
@@ -1,402 +1,400 @@
$.fn.realVal = function() {
- var obj = $(this[0]);
- if(obj.val) {
- if(obj.val() == obj.attr('defaultText')) {
- return '';
- }
- else {
- return obj.val();
- }
- }
- else {
- return null;
- }
+ var obj = $(this[0]);
+ if(obj.val) {
+ if(obj.val() == obj.attr('defaultText')) {
+ return '';
+ }
+ else {
+ return obj.val();
+ }
+ }
+ else {
+ return null;
+ }
};
function init_events_base(base_node, embed_url) {
-
- $('.ldt_link_embed',base_node).click(function(e) {
- e.preventDefault();
- var link = $(e.target);
- var json_url = link.attr("href");
- var player_id = link.attr("id");
- var ldt_id = player_id.substring(15);
- $('<a />', {
- href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
- target: "_blank"
- }).nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: '750',
- minH: '662'
- },
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.height(662);
- nm.store.iframe.width(750);
- }
- }
- }).trigger('nyroModal');
- return false;
- });
+
+ $('.ldt_link_embed',base_node).click(function(e) {
+ e.preventDefault();
+ var link = $(e.target);
+ var json_url = link.attr("href");
+ var player_id = link.attr("id");
+ var ldt_id = player_id.substring(15);
+ $('<a />', {
+ href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id),
+ target: "_blank"
+ }).nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: '750',
+ minH: '662'
+ },
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(662);
+ nm.store.iframe.width(750);
+ }
+ }
+ }).trigger('nyroModal');
+ return false;
+ });
- $('.imageline',base_node).each(function(i) {
- var tr = $(this);
- tr.mouseover(function() {
- $('.cellimgdiv',this).css('visibility', 'visible');
- });
- tr.mouseout(function() {
- $('.cellimgdiv',this).css('visibility', 'hidden');
- });
- });
-
- $('.cellimgdiv img').qtip({
- style: {
- 'name': 'dark',
- 'filter':'alpha(opacity=70)',
- '-moz-opacity':'0.7',
- '-khtml-opacity': '0.7',
- 'opacity': '0.7',
- 'border': {
- 'width' : '0',
- 'color': '#505050'
- },
- 'tip': true
- }
- });
-
+ $('.imageline',base_node).each(function(i) {
+ var tr = $(this);
+ tr.mouseover(function() {
+ $('.cellimgdiv',this).css('visibility', 'visible');
+ });
+ tr.mouseout(function() {
+ $('.cellimgdiv',this).css('visibility', 'hidden');
+ });
+ });
+
+ $('.cellimgdiv img').qtip({
+ style: {
+ 'name': 'dark',
+ 'filter':'alpha(opacity=70)',
+ '-moz-opacity':'0.7',
+ '-khtml-opacity': '0.7',
+ 'opacity': '0.7',
+ 'border': {
+ 'width' : '0',
+ 'color': '#505050'
+ },
+ 'tip': true
+ }
+ });
+
};
-function testAndClose() {
- // Here we ask LDT if the current work is modified and if the user want to save it.
- var ldtSwf = $('#ldtInitSwf',$.nmTop().store.iframe.contents()).get(0);
- // In the ldt_link_create case, the modal page can be the form, or the ldt swf. So we have to test.
- if (ldtSwf) {
- if (ldtSwf.name=="ldtInitSwf") {
- if(ldtSwf.isModified()=="true") {
- //ldtSwf.forceSave();
- ldtSwf.askSave();
- }
- else{
- forceModalClose();
- }
- }
- else{
- forceModalClose();
- }
- }
- else{
- forceModalClose();
- }
+function testAndClose(old_close) {
+
+ return function(force) {
+ // Here we ask LDT if the current work is modified and if the user want to save it.
+ var ldtSwf = $('#ldtInitSwf',$.nmTop().store.iframe.contents()).get(0);
+ // In the ldt_link_create case, the modal page can be the form, or the ldt swf. So we have to test.
+ if (!force && ldtSwf && ldtSwf.name=="ldtInitSwf" && ldtSwf.isModified()=="true") {
+ ldtSwf.askSave();
+ }
+ else {
+ old_close.apply(this);
+ }
+ };
}
function searchCallback(target, container_selector, url, timeout) {
- timeout = typeof(timeout) != 'undefined' ? timeout : 0;
- var target = $(target);
-
- // remove all qtip
- $(".qtip").remove();
-
- if(target.realVal().length > 0) {
- target.nextAll(".searchclear").show();
- }
+ timeout = typeof(timeout) != 'undefined' ? timeout : 0;
+ var target = $(target);
+
+ // remove all qtip
+ $(".qtip").remove();
+
+ if(target.realVal().length > 0) {
+ target.nextAll(".searchclear").show();
+ }
- if(target.attr('timer')) {
- clearTimeout(target.attr('timer'));
- }
+ if(target.attr('timer')) {
+ clearTimeout(target.attr('timer'));
+ }
- target.attr(
- 'timer',
- setTimeout(function() {
- target.next(".searchajaxloader").show();
- target.nextAll(".searchclear").hide();
- var filterVal = "_" + escape(target.realVal());
- url = url.replace('__FILTER__',filterVal);
- $.ajax({
- url: url,
- cache: false,
- success: function(data, status, request) {
- $(container_selector).html(data);
- target.next(".searchajaxloader").hide();
- if(target.realVal().length > 0) {
- target.nextAll(".searchclear").show();
- }
- init_events($(container_selector));
- target.removeAttr('timer');
- }
- });
- },
- 300)
- );
+ target.attr(
+ 'timer',
+ setTimeout(function() {
+ target.next(".searchajaxloader").show();
+ target.nextAll(".searchclear").hide();
+ var filterVal = "_" + escape(target.realVal());
+ url = url.replace('__FILTER__',filterVal);
+ $.ajax({
+ url: url,
+ cache: false,
+ success: function(data, status, request) {
+ $(container_selector).html(data);
+ target.next(".searchajaxloader").hide();
+ if(target.realVal().length > 0) {
+ target.nextAll(".searchclear").show();
+ }
+ init_events($(container_selector));
+ target.removeAttr('timer');
+ }
+ });
+ },
+ 300)
+ );
};
function init_events_contents(base_node, embed_url, content_filter_url) {
- init_events_base(base_node, embed_url);
-
- $('.content_link_create').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.content_link_create').nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: 770,
- minH: 500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.width(770);
- nm.store.iframe.height(500);
- nm.store.iframe.load(function() {
- var form_status = $(this).contents().find("#content_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted' ) {
- $.nmTop().close();
- }
- });
- }
- }
- });
+ init_events_base(base_node, embed_url);
+
+ $('.content_link_create').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.content_link_create').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: 770,
+ minH: 500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#contentslistcontainer", content_filter_url);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(770);
+ nm.store.iframe.height(500);
+ nm.store.iframe.load(function() {
+ var form_status = $(this).contents().find("#content_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted' ) {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
- $('.contenttitlelink').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.contenttitlelink').nyroModal({
- filters: ['iframe'],
- sizes: {
- minW: 770,
- minH: 500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.width(770);
- nm.store.iframe.height(500);
- nm.store.iframe.load(function() {
- var form_status = $(this).contents().find("#content_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted') {
- $.nmTop().close();
- }
- });
- }
- }
- });
+ $('.contenttitlelink').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.contenttitlelink').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minW: 770,
+ minH: 500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(770);
+ nm.store.iframe.height(500);
+ nm.store.iframe.load(function() {
+ var form_status = $(this).contents().find("#content_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted') {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
}
function init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
- // These are the functions called when we display a project in an LDT modal window
- $('.ldt_link',base_node).each(function(i){
- $(this).attr("target","_iri");
- });
- $('.ldt_link',base_node).nyroModal({
- filters: ['iriIframe'],
- sizes: {
- minW: '1022',
- minH: '662'
- },
- showCloseButton: true,
- closeOnEscape:false,
- closeOnClick:false,
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.height(662);
- nm.store.iframe.width(1022);
- },
- close: function(nm) {
- // We don't do anything here, we hack the callback directly from the close function.
- },
- afterClose: function(nm) {
- // Can't do that because searchprojectfilterurl is not defined in init_events_base params
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- },
- close:function(nm){
- testAndClose();
- }
+ // These are the functions called when we display a project in an LDT modal window
+ $('.ldt_link',base_node).each(function(i){
+ $(this).attr("target","_iri");
});
+ $('.ldt_link',base_node).nyroModal({
+ filters: ['iriIframe'],
+ sizes: {
+ minW: '1022',
+ minH: '662'
+ },
+ showCloseButton: true,
+ closeOnEscape:false,
+ closeOnClick:false,
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(662);
+ nm.store.iframe.width(1022);
+ },
+ close: function(nm) {
+ // We don't do anything here, we hack the callback directly from the close function.
+ },
+ afterClose: function(nm) {
+ // Can't do that because searchprojectfilterurl is not defined in init_events_base params
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ },
+ });
+
+ $('.ldt_link',base_node).each(function(i, e) {
+ nm = $(e).data('nmObj');
+ $(e).data('nmObj', $.extend(true, nm, {
+ close: testAndClose(nm.close)
+ }));
+ });
- $('.ldt_link_create',base_node).each(function(i){
- $(this).attr("target","_iri");
- });
- $('.ldt_link_create',base_node).nyroModal({
-
- filters: ['iriIframe'],
- sizes: {
- minW: '600',
- minH: '500'
- },
- showCloseButton:true,
- closeOnEscape:false,
- closeOnClick:false,
- callbacks: {
- afterShowCont: function(nm) {
- nm.store.iframe.width(600);
- nm.store.iframe.height(500);
- var iframe = nm.store.iframe;
- iframe.load(function(){
- var form_status = $(this).contents().find("#project_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted' ) {
- $.nmTop().close();
- }
- var swfobject = $(this).contents().find("#ldtInitSwf");
- if (swfobject.length) {
- nm['sizes']['initW'] = swfobject.width() + 21;
- nm['sizes']['initH'] = swfobject.height() + 31;
- nm.resize();
- nm.store.iframe.height(swfobject.height() + 31);
- nm.store.iframe.width(swfobject.width() + 21);
- }
- });
- },
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- },
- close:function(){
- testAndClose();
- }
-
+ $('.ldt_link_create',base_node).each(function(i){
+ $(this).attr("target","_iri");
+ });
+ $('.ldt_link_create',base_node).nyroModal({
+
+ filters: ['iriIframe'],
+ sizes: {
+ minW: '600',
+ minH: '500'
+ },
+ showCloseButton:true,
+ closeOnEscape:false,
+ closeOnClick:false,
+ callbacks: {
+ afterShowCont: function(nm) {
+ nm.store.iframe.width(600);
+ nm.store.iframe.height(500);
+ var iframe = nm.store.iframe;
+ iframe.load(function(){
+ var form_status = $(this).contents().find("#project_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted' ) {
+ $.nmTop().close();
+ }
+ var swfobject = $(this).contents().find("#ldtInitSwf");
+ if (swfobject.length) {
+ nm['sizes']['initW'] = swfobject.width() + 21;
+ nm['sizes']['initH'] = swfobject.height() + 31;
+ nm.resize();
+ nm.store.iframe.height(swfobject.height() + 31);
+ nm.store.iframe.width(swfobject.width() + 21);
+ }
+ });
+ },
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
+ $('.ldt_link_create',base_node).each(function(i, e) {
+ nm = $(e).data('nmObj');
+ $(e).data('nmObj', $.extend(true, nm, {
+ close: testAndClose(nm.close)
+ }));
+ });
+
+
+ $('.publishedproject', base_node).click(function(e) {
+ e.preventDefault();
+ var target = $(e.target);
+ var project_id = target.attr('id').replace('project_','');
+ var url = unpublishprojecturl.replace('__PROJECT_ID__', project_id);
+ $.ajax({
+ url: url,
+ type: 'POST',
+ dataType: 'json',
+ success: function(json, textStatus, XMLHttpRequest){
+ if(json.res) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
});
-
- $('.publishedproject', base_node).click(function(e) {
- e.preventDefault();
- var target = $(e.target);
- var project_id = target.attr('id').replace('project_','');
- var url = unpublishprojecturl.replace('__PROJECT_ID__', project_id);
- $.ajax({
- url: url,
- type: 'POST',
- dataType: 'json',
- success: function(json, textStatus, XMLHttpRequest){
- if(json.res) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- }
- });
- });
+ $('.unpublishedproject', base_node).click(function(e) {
+ e.preventDefault();
+ var target = $(e.target);
+ var project_id = target.attr('id').replace('project_','');
+ var url = publishprojecturl.replace('__PROJECT_ID__', project_id);
+ $.ajax({
+ url: url,
+ type: 'POST',
+ dataType: 'json',
+ success: function(json, textStatus, XMLHttpRequest){
+ if(json.res) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ }
+ }
+ });
+ });
- $('.unpublishedproject', base_node).click(function(e) {
- e.preventDefault();
- var target = $(e.target);
- var project_id = target.attr('id').replace('project_','');
- var url = publishprojecturl.replace('__PROJECT_ID__', project_id);
- $.ajax({
- url: url,
- type: 'POST',
- dataType: 'json',
- success: function(json, textStatus, XMLHttpRequest){
- if(json.res) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- }
- }
- });
- });
-
- $('.projecttitlelink').each(function(i){
- $(this).attr("target","_blank");
- });
- $('.projecttitlelink').nyroModal({
- filters: ['iframe'],
- sizes: {
- minH:680,
- minW:500
- },
- callbacks: {
- afterClose: function(nm) {
- searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
- },
- afterShowCont: function(nm) {
- nm.store.iframe.height(680);
- nm.store.iframe.width(600);
- var iframe = nm.store.iframe;
- iframe.load(function(){
- var form_status = $(this).contents().find("#project_form_status").val();
- if(form_status == 'saved' || form_status == 'deleted') {
- $.nmTop().close();
- }
- });
- }
- }
- });
-
+ $('.projecttitlelink').each(function(i){
+ $(this).attr("target","_blank");
+ });
+ $('.projecttitlelink').nyroModal({
+ filters: ['iframe'],
+ sizes: {
+ minH:680,
+ minW:500
+ },
+ callbacks: {
+ afterClose: function(nm) {
+ searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0);
+ },
+ afterShowCont: function(nm) {
+ nm.store.iframe.height(680);
+ nm.store.iframe.width(600);
+ var iframe = nm.store.iframe;
+ iframe.load(function(){
+ var form_status = $(this).contents().find("#project_form_status").val();
+ if(form_status == 'saved' || form_status == 'deleted') {
+ $.nmTop().close();
+ }
+ });
+ }
+ }
+ });
+
}
function init_events_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-
- init_events_base(base_node, embed_url);
- init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
+
+ init_events_base(base_node, embed_url);
+ init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
}
function init_events_all(base_node, embed_url, searchcontentfilterurl, searchprojectfilterurl, publishprojecturl, unpublishprojecturl) {
-
- init_events_contents(base_node, embed_url, searchcontentfilterurl);
- init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
+
+ init_events_contents(base_node, embed_url, searchcontentfilterurl);
+ init_events_base_projects(base_node, embed_url, searchprojectfilterurl, publishprojecturl, unpublishprojecturl);
}
function searchFieldInit(input_list_init) {
- $(".searchfieldinputbase").keydown(function (e) {
- if(e.which == 27) {
- $(e.target).blur();
- $(e.target).next(".searchajaxloader").hide();
- }
- });
-
- $('.searchfieldinput').each(function(i) {
- var sbox = $(this);
- if(sbox.val() != '') {
- sbox.attr('defaultText', sbox.val());
- }
-
- sbox.focus(function() {
- box = $(this);
- if(box.val() == box.attr('defaultText')) {
- box.val('');
- box.toggleClass("searchfieldinput");
- }
- });
-
- sbox.blur(function() {
- var box = $(this);
- if(box.val() == '' && box.attr('defaultText')) {
- box.val(box.attr('defaultText'));
- box.toggleClass("searchfieldinput");
- }
- });
-
- });
+ $(".searchfieldinputbase").keydown(function (e) {
+ if(e.which == 27) {
+ $(e.target).blur();
+ $(e.target).next(".searchajaxloader").hide();
+ }
+ });
+
+ $('.searchfieldinput').each(function(i) {
+ var sbox = $(this);
+ if(sbox.val() != '') {
+ sbox.attr('defaultText', sbox.val());
+ }
+
+ sbox.focus(function() {
+ box = $(this);
+ if(box.val() == box.attr('defaultText')) {
+ box.val('');
+ box.toggleClass("searchfieldinput");
+ }
+ });
+
+ sbox.blur(function() {
+ var box = $(this);
+ if(box.val() == '' && box.attr('defaultText')) {
+ box.val(box.attr('defaultText'));
+ box.toggleClass("searchfieldinput");
+ }
+ });
+
+ });
- $.each(input_list_init, function(index, value) {
- $(value['input_selector']).keyup(function (e) {
- searchCallback(e.target, value['container_selector'], value['url']);
- });
- });
-
- $('.searchclear').click(function(e) {
- var box = $(e.target).parent().find("input");
- box.val(box.attr('defaultText'));
- box.addClass("searchfieldinput");
- box.blur();
- box.keyup();
- });
-
- $('.searchclear').each(function(i) {
- $(this).hide();
- });
+ $.each(input_list_init, function(index, value) {
+ $(value['input_selector']).keyup(function (e) {
+ searchCallback(e.target, value['container_selector'], value['url']);
+ });
+ });
+
+ $('.searchclear').click(function(e) {
+ var box = $(e.target).parent().find("input");
+ box.val(box.attr('defaultText'));
+ box.addClass("searchfieldinput");
+ box.blur();
+ box.keyup();
+ });
+
+ $('.searchclear').each(function(i) {
+ $(this).hide();
+ });
}
