From: olivier <>
Date: Tue, 16 Feb 2010 17:08:50 +0000 (+0000)
Subject: fix a few js and css issues on ie6 and ie7
X-Git-Tag: 1.1~519
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0cac28882b7630d97f4443935873e8a3769e5f7b;p=telemeta.git

fix a few js and css issues on ie6 and ie7
---

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index cc812370..fe94a4cf 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -235,6 +235,7 @@ label.disabled { color: #d7d7d7 }
 }
 #quick_search p {
     margin-top: .3em;
+    clear: left;
 }
 #quick_search a {
     font-size: .8em;
@@ -680,18 +681,18 @@ a.image-link {
     padding-right: 370px;
 }
 
-ul.playlist {
+#content ul.playlist {
     list-style-type: none;
     border-top: solid 1px #e1e1e1;
     margin: 0;
-    padding: 0 !important;
+    padding: 0;
 }
 
-ul.playlist li {
+#content ul.playlist li {
     display: block;
     border: solid 1px #e1e1e1;
     border-top: 0;
     background: white;
     margin: 0;
-    padding: 1em !important;
+    padding: 1em;
 }
diff --git a/telemeta/htdocs/js/jquery.bgiframe.js b/telemeta/htdocs/js/jquery.bgiframe.js
new file mode 100644
index 00000000..ef8679d9
--- /dev/null
+++ b/telemeta/htdocs/js/jquery.bgiframe.js
@@ -0,0 +1,10 @@
+/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * $LastChangedDate: 2007-07-21 18:45:56 -0500 (Sat, 21 Jul 2007) $
+ * $Rev: 2447 $
+ *
+ * Version 2.1.1
+ */
+(function($){$.fn.bgIframe=$.fn.bgiframe=function(s){if($.browser.msie&&/6.0/.test(navigator.userAgent)){s=$.extend({top:'auto',left:'auto',width:'auto',height:'auto',opacity:true,src:'javascript:false;'},s||{});var prop=function(n){return n&&n.constructor==Number?n+'px':n;},html='<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+'style="display:block;position:absolute;z-index:-1;'+(s.opacity!==false?'filter:Alpha(Opacity=\'0\');':'')+'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+'"/>';return this.each(function(){if($('> iframe.bgiframe',this).length==0)this.insertBefore(document.createElement(html),this.firstChild);});}return this;};})(jQuery);
\ No newline at end of file
diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index 361ab209..8e19a0bb 100644
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -10,9 +10,10 @@
 {% endblock %}
 
 {% block extra_javascript %}
+<script src="{% url telemeta-js "jquery.bgiframe.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "jquery.autocomplete.js" %}" type="text/javascript"></script>
 <script type="text/javascript">
-function update_period(from_field, to_field) {
+function update_period(source, from_field, to_field) {
     var from_year = $(from_field);
     var to_year = $(to_field);
 
@@ -21,11 +22,11 @@ function update_period(from_field, to_field) {
         to_year.val('0');
     } else {
         to_year.removeAttr('disabled');
-        if (this == to_year.get(0)) {
-            if (from_year.val() > to_year.val())
+        if ($(source).is(to_field)) {
+            if (parseInt(from_year.val()) > parseInt(to_year.val()))
                 from_year.val(to_year.val());
-        } else if ((from_year.val() > to_year.val())) {
-                to_year.val(from_year.val());
+        } else if (parseInt(from_year.val()) > parseInt(to_year.val())) {
+            to_year.val(from_year.val());
         }
     }
 }
@@ -34,17 +35,16 @@ $(document).ready(function () {
     $('#location').autocomplete('{% url telemeta-complete-location %}', {
         max: 20,
         formatResult: function(data) {
-            console.log(data);
             return data[0].replace(/ *\([0-9]+.*\) *$/, '');
         }
     });
     update_period('#rec_year_from', '#rec_year_to');
     $('#rec_year_from, #rec_year_to').change(function () {
-        update_period('#rec_year_from', '#rec_year_to');
+        update_period(this, '#rec_year_from', '#rec_year_to');
     });
     update_period('#pub_year_from', '#pub_year_to');
     $('#pub_year_from, #pub_year_to').change(function () {
-        update_period('#pub_year_from', '#pub_year_to');
+        update_period(this, '#pub_year_from', '#pub_year_to');
     });
 });