X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=b196a68f846dbe3222b3309ac46f4066735daedb;hp=1e074bb83397305805048f3dd078ed467519e801;hb=5bc350814a9426a89e8ab06728badad9430d4015;hpb=a36bd6f4555cf410712611b5efcb82fdf5898551

diff --git a/phpfspot.js b/phpfspot.js
index 1e074bb..b196a68 100644
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -113,9 +113,6 @@ function startSearch()
       request = request + '&from='+ from +'&to='+ to;
    }
 
-   var sort_order = document.getElementsByName('sort_order')[0];
-   request = request + '&sort_order='+ sort_order.options[sort_order.selectedIndex].value;
-
    HTML_AJAX.grab(encodeURI(request));
 
    refreshAvailableTags();
@@ -151,6 +148,11 @@ function setViewMode(mode)
 function clearSearch()
 {
    document.getElementsByName('searchfor')[0].value = '';
+
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      document.getElementsByName('consider_date')[0].checked = false;
+      datesearch();
+   }  
 }
 
 function AskServerWhatToDo()
@@ -204,6 +206,8 @@ function getPhotoToShow()
 function showCalendar(date_box, click_obj)
 {
    var calendar = document.getElementById('calendar');
+   var year = document.getElementById(date_box+'year').value;
+   var month = document.getElementById(date_box+'month').value;
    if(date_box == 'from') {
       var xpos = document.getElementById('frompic').offsetLeft;
       var ypos = document.getElementById('frompic').offsetTop;
@@ -214,16 +218,24 @@ function showCalendar(date_box, click_obj)
       var ypos = document.getElementById('topic').offsetTop;
       calendar_mode = 'to';
    }
-   calendar.style.left = xpos + 60 + 'px';
+   calendar.style.left = xpos + 100 + 'px';
    calendar.style.top = ypos + 80 + 'px';
 
    if(calendar.style.visibility == "" || calendar.style.visibility == 'hidden') {
       calendar.style.visibility = 'visible';
       calendar.innerHTML = "Loading...";
-      calendar.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_calendar_matrix'));
+      calendar.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=get_calendar_matrix&year=' + year + '&month=' + month));
       calendar_shown = 1;
    }
    else {
+      hideCalendar();
+   }
+}
+
+function hideCalendar()
+{
+   var calendar = document.getElementById('calendar');
+   if(calendar.style.visibility != 'hidden') {
       calendar.style.visibility = 'hidden';
       calendar_shown = 0;
    }
@@ -241,6 +253,7 @@ function setCalendarDate(year, month, day)
    document.getElementById(calendar_mode+'year').value = year;
    document.getElementById(calendar_mode+'month').value = month;
    document.getElementById(calendar_mode+'day').value = day;
+   hideCalendar();
 }
 
 function resetAll()
@@ -305,7 +318,7 @@ function startSlideShow()
    if(!sliding) {
       HTML_AJAX.grab(encodeURI('rpc.php?action=reset_slideshow'));
       nextSlide();
-      sliding = setInterval("nextSlide()", 3000);
+      sliding = setInterval("nextSlide()", sliding_time*1000);
       document.getElementById('stop_ico').src = "resources/32_stop.png";
    }
    else {
@@ -336,7 +349,7 @@ function pauseSlideShow()
    }
    else {
       sliding_paused = 0;
-      sliding = setInterval("nextSlide()", 3000);
+      sliding = setInterval("nextSlide()", sliding_time*1000);
       document.getElementById('pause_ico').src = "resources/32_pause.png";
    }
 } 
@@ -363,9 +376,50 @@ function autoBrowse()
    }
 }  
 
+function initSlider()
+{
+   var sliderEl = document.getElementById ? document.getElementById("slider-1") : null;
+   var inputEl = document.forms[0]["slider-input-1"];
+   var s = new Slider(sliderEl, inputEl);
+   s.setMinimum(1);
+   s.setMaximum(10);
+   s.setValue(sliding_time);
+   document.getElementById("current_slide_time").innerHTML = sliding_time + "s Interval";
+   s.onchange = function () {
+      sliding_time = s.getValue();
+      document.getElementById("current_slide_time").innerHTML = sliding_time + "s Interval";
+      if(!sliding_paused && sliding) {
+         clearInterval(sliding);
+         sliding = setInterval("nextSlide()", sliding_time*1000);
+      }
+   };
+   window.onresize = function () {
+      s.recalculate();
+   };
+
+}
+
+function update_sort_order(obj)
+{  
+   var objTemp = new Object();
+   objTemp['value'] = obj.options[obj.selectedIndex].value;
+
+   var retr = HTML_AJAX.post('rpc.php?action=update_sort_order', objTemp);
+
+   if(retr == "ok") {
+      showPhotoIndex();
+   }
+   else {
+      window.alert(retr);
+   }
+
+} // update_sort_order()
+
+
 var startup = 1;
 var calendar_shown = 0;
 var calendar_mode = '';
 var autobrowse = 0;
 var sliding = 0;
 var sliding_paused = 0;
+var sliding_time = 3;