diff --git a/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php b/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php
index f92855cbc..87f2fbd56 100644
--- a/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php
+++ b/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php
@@ -2,7 +2,7 @@
 $Smarty->register_object('UIBROWSER', $uiBrowser);
 $Smarty->register_object('BROWSE',    $uiBrowser->BROWSE);
 $Smarty->register_object('SEARCH',    $uiBrowser->SEARCH);
-$Smarty->assign_by_ref  ('PL',        $uiBrowser->PLAYLIST);  
+$Smarty->assign_by_ref  ('PL',        $uiBrowser->PLAYLIST);
 $Smarty->assign_by_ref  ('SCHEDULER', $uiBrowser->SCHEDULER);
 
 $Smarty->register_function('str_repeat', 'S_str_repeat');
diff --git a/livesupport/modules/htmlUI/var/formmask/general.inc.php b/livesupport/modules/htmlUI/var/formmask/general.inc.php
index 8b2921f05..21a5490a9 100755
--- a/livesupport/modules/htmlUI/var/formmask/general.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/general.inc.php
@@ -21,7 +21,7 @@ $ui_fmask = array(
             'attributes'   => array(
                                 'onClick'  => 'alert ("Note: System Maximum is set to '.
                                                 ini_get('upload_max_filesize')
-                                                .' in php.ini\n You can just reduce this amount this here.")'
+                                                .' in php.ini\n You can just reduce this amount here.")'
                            )
         ),
         array(
@@ -76,10 +76,9 @@ $ui_fmask = array(
             'type'      => 'select',
             'label'     => 'Maximun length of ScratchPad',
             'options'   => array(
-                            0   => '--',
                             5   => 5,
                             10  => 10,
-                            20  => 20
+                            25  => 25
                            )
         ),
         array(
@@ -278,10 +277,21 @@ $ui_fmask = array(
             'required'  => TRUE,
             'requiredmsg'=> 'please select Media file'
         ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick'  => "location.href='".UI_BROWSER."'"),
+            'groupit'   => TRUE
+        ),
         array(
             'element'   => 'Submit',
             'type'      => 'submit',
-            'label'     => 'Submit'
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'Submit')
         )
     ),
 
@@ -320,10 +330,21 @@ $ui_fmask = array(
             'label'     => 'Length<br><small>Leave zero for Live Stream</small>',
             'options'   => array('format' => 'His'),
         ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick'  => "location.href='".UI_BROWSER."'"),
+            'groupit'   => TRUE
+        ),
         array(
             'element'   => 'Submit',
             'type'      => 'submit',
-            'label'     => 'Submit'
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'Submit')
         )
     ),
 
@@ -371,12 +392,11 @@ $ui_fmask = array(
             'type'      => 'select',
             'label'     => 'Rows per Page',
             'options'   => array(
-                                2   => 2,
-                                5   => 5,
-                                10  => 10,
-                                25  => 25,
-                                50  => 50,
-                                100 => 100
+                            5   => 5,
+                            10  => 10,
+                            25  => 25,
+                            50  => 50,
+                            100 => 100
                            )
         ),
         array(
@@ -461,9 +481,10 @@ $ui_fmask = array(
             'type'      => 'select',
             'multiple'  => TRUE,
             'attributes'=> array(
-                            'size' => 10,
-                            'STYLE' => 'width: 220px',
-                            'onChange' => 'this.form.act.value="BROWSE.setValue"; this.form.submit()')
+                'size' => 10,
+                'STYLE' => 'width: 220px',
+                'onChange' => 'this.form.act.value="BROWSE.setValue"; this.form.submit()'
+            )
         )
     ),
 
@@ -489,117 +510,185 @@ $ui_fmask = array(
             'type'      => 'select',
             'label'     => 'Rows per Page',
             'options'   => array(
-                                2   => 2,
-                                5   => 5,
-                                10  => 10,
-                                25  => 25,
-                                50  => 50,
-                                100 => 100
+                            5   => 5,
+                            10  => 10,
+                            25  => 25,
+                            50  => 50,
+                            100 => 100
                            ),
             'attributes'=> array('onChange' => 'hpopup("'.UI_HANDLER.'?act=BROWSE.setLimit&limit=" + this.form.limit.value)')
         )
     ),
 
+    'simplesearch'  => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'SEARCH.simpleSearch'
+        ),
+        array(
+            'element'   => 'criterium',
+            'type'      => 'text',
+            'label'     => NULL,
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'submit',
+            'type'      => 'submit',
+            'label'     => 'Search',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('criterium', 'submit')
+        )
+    ),
+
     'PL.changeTransition'  => array(
         'transition' => array(
-                array(
-                    'element'   => 'headline',
-                    'type'      => 'static'
-                ),
-                array(
-                    'element'   => 'type',
-                    'type'      => 'radio',
-                    'label'     => 'Type',
-                    'options'   => array(
-                                    'fadeX'      => 'Crossfade',
-                                    'pause'      => 'Pause'
-                                   ),
-                    'default'   => 'fadeX'
-                )
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array(
+                                'fadeX'      => 'Crossfade',
+                                'pause'      => 'Pause'
+                               ),
+                'default'   => 'fadeX'
+            )
         ),
         'fadeIn' => array(
-                array(
-                    'element'   => 'headline',
-                    'type'      => 'static'
-                ),
-                array(
-                    'element'   => 'type',
-                    'type'      => 'radio',
-                    'label'     => 'Type',
-                    'options'   => array('fadeIn' => 'Fade in'),
-                    'default'   => 'fadeIn'
-                )
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array('fadeIn' => 'Fade in'),
+                'default'   => 'fadeIn'
+            )
         ),
         'fadeOut' => array(
-                array(
-                    'element'   => 'headline',
-                    'type'      => 'static'
-                ),
-                array(
-                    'element'   => 'type',
-                    'type'      => 'radio',
-                    'label'     => 'Type',
-                    'options'   => array('fadeOut' => 'Fade out'),
-                    'default'   => 'fadeOut'
-                )
-        ),
-        'all'           => array(
-               array(
-                   'element'   => 'act',
-                   'type'      => 'hidden',
-                   'constant'  => 'PL.changeTransition'
-               ),
-               array(
-                   'element'   => 'id',
-                   'type'      => 'hidden'
-               ),
-               array(
-                   'element'   => 'duration',
-                   'type'      => 'text',
-                   'rule'      => 'numeric',
-                   'attributes'=> array('size' => 4, 'maxlength' => 4),
-                   'groupit'   => TRUE
-               ),
-               array(
-                   'element'   => 'switchdown',
-                   'type'      => 'button',
-                   'label'     => '-',
-                   'attributes'=> array('onClick' => 'pl_switchDown()', 'onMousedown' => 'pl_start("Down")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
-                   'groupit'   => TRUE
-               ),
-               array(
-                   'element'   => 'switchup',
-                   'type'      => 'button',
-                   'label'     => '+',
-                   'attributes'=> array('onClick' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
-                   'groupit'   => TRUE
-               ),
-               array(
-                   'group'     => array('duration', 'switchdown', 'switchup'),
-                   'label'     => 'Duration'
-               ),
-               array(
-                   'element'   => 'cancel',
-                   'type'      => 'button',
-                   'label'     => 'Cancel',
-                   'attributes'=> array('onClick' => 'window.close()'),
-                   'groupit'   => TRUE,
-               ),
-               array(
-                   'element'   => 'reset',
-                   'type'      => 'reset',
-                   'label'     => 'Reset',
-                   'groupit'   => TRUE,
-               ),
-               array(
-                   'element'   => 'submit',
-                   'type'      => 'submit',
-                   'label'     => 'Submit',
-                   'groupit'   => TRUE,
-               ),
-               array(
-                   'group'     => array('cancel', 'reset', 'submit')
-               )
+            array(
+                'element'   => 'headline',
+                'type'      => 'static'
+            ),
+            array(
+                'element'   => 'type',
+                'type'      => 'radio',
+                'label'     => 'Type',
+                'options'   => array('fadeOut' => 'Fade out'),
+                'default'   => 'fadeOut'
             )
+        ),
+        'all'   => array(
+            array(
+                'element'   => 'act',
+                'type'      => 'hidden',
+                'constant'  => 'PL.changeTransition'
+            ),
+            array(
+                'element'   => 'id',
+                'type'      => 'hidden'
+            ),
+            array(
+                'element'   => 'duration',
+                'type'      => 'text',
+                'rule'      => 'numeric',
+                'attributes'=> array('size' => 4, 'maxlength' => 4),
+                'groupit'   => TRUE
+            ),
+            array(
+                'element'   => 'switchdown',
+                'type'      => 'button',
+                'label'     => '-',
+                'attributes'=> array('onClick' => 'pl_switchDown()', 'onMousedown' => 'pl_start("Down")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
+                'groupit'   => TRUE
+            ),
+            array(
+                'element'   => 'switchup',
+                'type'      => 'button',
+                'label'     => '+',
+                'attributes'=> array('onClick' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"),
+                'groupit'   => TRUE
+            ),
+            array(
+                'group'     => array('duration', 'switchdown', 'switchup'),
+                'label'     => 'Duration'
+            ),
+            array(
+                'element'   => 'cancel',
+                'type'      => 'button',
+                'label'     => 'Cancel',
+                'attributes'=> array('onClick' => 'window.close()'),
+                'groupit'   => TRUE,
+            ),
+            array(
+                'element'   => 'reset',
+                'type'      => 'reset',
+                'label'     => 'Reset',
+                'groupit'   => TRUE,
+            ),
+            array(
+                'element'   => 'submit',
+                'type'      => 'submit',
+                'label'     => 'Submit',
+                'groupit'   => TRUE,
+            ),
+            array(
+                'group'     => array('cancel', 'reset', 'submit')
+            )
+        )
+    ),
+    'schedule'  => array(
+        array(
+            'element'   => 'act',
+            'type'      => 'hidden',
+            'constant'  => 'SCHEDULER.uploadPlaylistMethod'
+        ),
+        'date'      => array(
+            'element'   => 'date',
+            'type'      => 'date',
+            'label'     => 'Date',
+            'options'   => array('format' => 'Ymd'),
+        ),
+        'time'      => array(
+            'element'   => 'time',
+            'type'      => 'date',
+            'label'     => 'Time',
+            'options'   => array('format' => 'His'),
+        ),
+        'playlist'  => array(
+            'element'   => 'playlist',
+            'type'      => 'select',
+            'label'     => 'Playlist',
+            'required'  => TRUE,
+        ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'reset',
+            'type'      => 'reset',
+            'label'     => 'Reset',
+            'groupit'   => TRUE
+        ),
+        array(
+            'element'   => 'submit',
+            'type'      => 'submit',
+            'label'     => 'Submit',
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'reset', 'submit')
+        )
     )
 );
diff --git a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
index 49ca1659d..0828a304e 100755
--- a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
@@ -21,6 +21,13 @@ $mask = array(
             'label'   =>'Reset',
             'groupit' => TRUE,
         ),
+        array(
+            'element'   => 'cancel',
+            'type'      => 'button',
+            'label'     => 'Cancel',
+            'attributes'=> array('onClick'  => "location.href='".UI_BROWSER."'"),
+            'groupit'   => TRUE
+        ),
         array(
             'element' =>'button',
             'type'    =>'button',
@@ -31,7 +38,7 @@ $mask = array(
                           ),
         ),
         array(
-            'group'   => array('reset', 'button'),
+            'group'   => array('reset', 'cancel', 'button'),
         )
     ),
     'tabs'  => array(
diff --git a/livesupport/modules/htmlUI/var/html/styles.css b/livesupport/modules/htmlUI/var/html/styles.css
index 2f0b2cfa7..24afcb479 100755
--- a/livesupport/modules/htmlUI/var/html/styles.css
+++ b/livesupport/modules/htmlUI/var/html/styles.css
@@ -163,4 +163,11 @@ a {
     border-style : dotted;
     padding : 5px;
     margin-top: 10px;
+}
+
+#simplesearchform {
+    width: 400px;
+    border-style : dotted;
+    padding : 5px;
+    margin-top: 10px;
 }
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php
index 4fe3dcb43..92fcc2748 100644
--- a/livesupport/modules/htmlUI/var/html/ui_browser.php
+++ b/livesupport/modules/htmlUI/var/html/ui_browser.php
@@ -55,25 +55,24 @@ if (is_array($_REQUEST['popup'])){
 };
 
 if ($uiBrowser->userid) {
-  $Smarty->assign('showMenuTop', TRUE);
-  $Smarty->assign('SCRATCHPAD',  $uiBrowser->SCRATCHPAD->get());
-  #$Smarty->assign('PLid',        $uiBrowser->PLAYLIST->activeId);
+    $Smarty->assign('showMenuTop',        TRUE);
+    $Smarty->assign('SCRATCHPAD',         $uiBrowser->SCRATCHPAD->get());
 
-  switch ($_REQUEST['act']){
+    switch ($_REQUEST['act']){
     case "fileList":
         $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->fid));
-
         $Smarty->assign('fileList', TRUE);
+
         if ($_REQUEST['tree']=='Y')
             $Smarty->assign('showTree', TRUE);
         else
             $Smarty->assign('showObjects', TRUE);
+
         $Smarty->assign('delOverride', $_REQUEST['delOverride']);
     break;
 
     case "permissions":
         $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
-
         $Smarty->assign('permissions', $uiBrowser->permissions($uiBrowser->id));
         $Smarty->assign('fileList', TRUE);
     break;
@@ -81,7 +80,6 @@ if ($uiBrowser->userid) {
 
     case "uploadFileM":
         $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
-
         $Smarty->assign('uploadform', $uiBrowser->uploadFileM($ui_fmask['uploadFileM'], $uiBrowser->id));
     break;
 
@@ -103,13 +101,11 @@ if ($uiBrowser->userid) {
     case "SEARCH":
         $Smarty->assign('searchForm', $uiBrowser->SEARCH->searchForm($uiBrowser->id, $ui_fmask));
         $Smarty->assign('showLibrary', TRUE);
-
     break;
 
     case "BROWSE":
         $Smarty->assign('browseForm', $uiBrowser->BROWSE->browseForm($uiBrowser->id, $ui_fmask));
         $Smarty->assign('showLibrary', TRUE);
-
     break;
 
     case "subjects":
@@ -168,7 +164,10 @@ if ($uiBrowser->userid) {
     case "SCHEDULER":
         $Smarty->assign('showScheduler', TRUE);
     break;
-  }
+    }
+
+    if ($_REQUEST['act'] != 'SCHEDULER')
+        $Smarty->assign('simpleSearchForm',   $uiBrowser->SEARCH->simpleSearchForm($ui_fmask['simplesearch']));
 }
 
 $Smarty->display('main.tpl');
diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php
index e9049365b..70726e2f9 100644
--- a/livesupport/modules/htmlUI/var/html/ui_handler.php
+++ b/livesupport/modules/htmlUI/var/html/ui_handler.php
@@ -132,6 +132,10 @@ switch($_REQUEST['act']){
         $uiHandler->SEARCH->newSearch($_REQUEST);
     break;
 
+    case "SEARCH.simpleSearch":
+        $uiHandler->SEARCH->simpleSearch($_REQUEST);
+    break;
+
     case "SEARCH.reOrder":
         $uiHandler->SEARCH->reOrder($_REQUEST['by']);
     break;
diff --git a/livesupport/modules/htmlUI/var/templates/header.tpl b/livesupport/modules/htmlUI/var/templates/header.tpl
index 4501933e1..0f204a514 100755
--- a/livesupport/modules/htmlUI/var/templates/header.tpl
+++ b/livesupport/modules/htmlUI/var/templates/header.tpl
@@ -7,7 +7,6 @@
     {include file="script/basics.js.tpl"}
     {include file="script/contextMenue.js.tpl"}
     {include file="script/collector.js.tpl"}
-    {include file="script/mouseOver.js.tpl"}
 </head>
 
 <body>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl
index 28c675b25..895045b6e 100755
--- a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl
+++ b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl
@@ -1,8 +1,3 @@
-{*Smarty template*}
-
-{* {include file="script/search.js.tpl"}   *}
-
-
 {literal}
 <style type="text/css">
     .dynformelement {
diff --git a/livesupport/modules/htmlUI/var/templates/library/main.tpl b/livesupport/modules/htmlUI/var/templates/library/main.tpl
index 7cfddbfeb..c5ffb3042 100755
--- a/livesupport/modules/htmlUI/var/templates/library/main.tpl
+++ b/livesupport/modules/htmlUI/var/templates/library/main.tpl
@@ -1,5 +1,3 @@
-{*Smarty template*}
-
 {if $searchForm}
     {assign var="_act_prefix" value="SEARCH"}
     {include file="library/searchForm.tpl"}
@@ -7,7 +5,7 @@
     {SEARCH->getCriteria assign=_criteria}
 {/if}
 
-{if $browseForm}    
+{if $browseForm}
     {assign var="_act_prefix" value="BROWSE"}
     {include file="library/browseForm.tpl"}
     {BROWSE->getResult assign=_results}
diff --git a/livesupport/modules/htmlUI/var/templates/script/search.js.tpl b/livesupport/modules/htmlUI/var/templates/library/search.js.tpl
similarity index 100%
rename from livesupport/modules/htmlUI/var/templates/script/search.js.tpl
rename to livesupport/modules/htmlUI/var/templates/library/search.js.tpl
diff --git a/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl b/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl
index cda48c8c9..4946f16d4 100755
--- a/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl
+++ b/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl
@@ -1,6 +1,4 @@
-{*Smarty template*}
-
-{include file="script/search.js.tpl"}
+{include file="library/search.js.tpl"}
 
 
 {literal}
diff --git a/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl
new file mode 100755
index 000000000..05a524d7e
--- /dev/null
+++ b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl
@@ -0,0 +1,5 @@
+{assign var="dynform" value=$simpleSearchForm}
+
+<div id="simplesearchform">
+{include file="sub/dynForm_plain.tpl"}
+</div>
diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl
index a71204f6f..f36d8b9f7 100755
--- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl
+++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl
@@ -12,6 +12,10 @@
     {include file="scratchPad.tpl"}
 {/if}
 
+{if $simpleSearchForm}
+    {include file="library/simpleSearchForm.tpl"}
+{/if}
+
 {if $structure}
     {include file="file/path.tpl"}
 {/if}
diff --git a/livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl b/livesupport/modules/htmlUI/var/templates/playlist/changeTransition.js.tpl
similarity index 100%
rename from livesupport/modules/htmlUI/var/templates/script/PL.changeTransition.js.tpl
rename to livesupport/modules/htmlUI/var/templates/playlist/changeTransition.js.tpl
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/changeTransition.tpl b/livesupport/modules/htmlUI/var/templates/playlist/changeTransition.tpl
index 924223b5d..3cdd833cd 100755
--- a/livesupport/modules/htmlUI/var/templates/playlist/changeTransition.tpl
+++ b/livesupport/modules/htmlUI/var/templates/playlist/changeTransition.tpl
@@ -1,6 +1,6 @@
 {include file="header.tpl"}
 
-{include file="script/PL.changeTransition.js.tpl"}
+{include file="playlist/changeTransition.js.tpl"}
 {include file="sub/dynForm_plain.tpl"}
 
 </body>
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/contextmenu.tpl
index d9e10bda1..9c4503cc1 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/contextmenu.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/contextmenu.tpl
@@ -1,6 +1,6 @@
 onMouseOver="highlight()"
 onMouseOut="darklight()"
-onContextmenu="return menu('{$_hour}', {$moreContextBefore} 'SCHEDULER.schedule' {$moreContextAfter})"
+onContextmenu="return menu('year={$_year}&month={$_month}&day={$_day}&hour={$_hour}', {$moreContextBefore} 'SCHEDULER.schedule' {$moreContextAfter})"
 
 
 {assign var="moreContextBefore" value=""}
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
index 814c19136..6ad6f778e 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl
@@ -4,7 +4,10 @@
 
 <table border=1 bgcolor="#97bacf">
 {foreach from=$SCHEDULER->Day item="_Hour"}
-    {assign var="_hour" value=$_Hour.hour}
+    {assign var="_year"  value=$_Hour.year}
+    {assign var="_month" value=$_Hour.month}
+    {assign var="_day"   value=$_Hour.day}
+    {assign var="_hour"  value=$_Hour.hour}
 
     <tr>
         <td {include file="scheduler/contextmenu.tpl"} bgcolor="#d4d0c8" height="50" valign="top">
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl
new file mode 100755
index 000000000..22562bf35
--- /dev/null
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/entry.tpl
@@ -0,0 +1 @@
+<small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl
index ef7bf8f9a..de55088f4 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/main.tpl
@@ -1,10 +1,13 @@
+{include file="scheduler/mouseOver.js.tpl"}
+
 <div class="standardFrame">
 {include file="sub/x.tpl"}
 
 <input type="button" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day')" value="Day">
 <input type="button" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=week')" value="Week">
 <input type="button" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=month')" value="Month">
-<input type="button" onClick="popup('{$UI_BROWSER}?popup[]=SCHEDULER.schedule', 'Schedule', 600, 400)" value="Schedule">
+<!-- <input type="button" onClick="popup('{$UI_BROWSER}?popup[]=SCHEDULER.schedule', 'Schedule', 600, 400)" value="Schedule">  -->
+<input type="button" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&today=1')" value="Today">
 
 {include file="scheduler/calendar.tpl"}
 
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
index 3a361aa4f..69cd2cfa8 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/month.tpl
@@ -20,14 +20,10 @@
         <tr>
     {/if}
 
-    {if $_Day.isEmpty}
-        <td>&nbsp;</td>
-    {else}
         <td width="80">
-            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&&day={$_Day.day}')"><b>{$_Day.day}</b>
+            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&year={$_Day.year}&month={$_Day.month}&day={$_Day.day}')"><b>{$_Day.day}</b>
             <div><img src="img/percentage_red.png" width="{if $percentage>50}{$percentage}{elseif $percentage>0}{$percentage+2}{else}0{/if}%" height="10" border="0"><img src="img/percentage_blue.png" width="{if $percentage>50}{$null-$percentage+100}{elseif $percentage>0}{$NULL-$percentage-2+100}{else}100{/if}%" height="10" border="0"></div>
         </td>
-    {/if}
 
     {if $_Day.isLast}
         </tr>
diff --git a/livesupport/modules/htmlUI/var/templates/script/mouseOver.js.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/mouseOver.js.tpl
similarity index 100%
rename from livesupport/modules/htmlUI/var/templates/script/mouseOver.js.tpl
rename to livesupport/modules/htmlUI/var/templates/scheduler/mouseOver.js.tpl
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
index d0f883f87..4ff337183 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/schedule.tpl
@@ -1,5 +1,19 @@
 {include file="header.tpl"}
-{$SCHEDULER->copyPlFromSP()}
+
+<center>
+{if $SCHEDULER->_copyPlFromSP()}
+    {assign var="dynform" value=$SCHEDULER->getScheduleForm()}
+    {include file="sub/dynForm_plain.tpl}
+{else}
+    First add Playlists to Scratchpad!
+{/if}
+</center>
+
+
+
+
+{*
+{$SCHEDULER->_copyPlFromSP()}
 
 <form name="schedule_it">
 <table>
@@ -7,7 +21,7 @@
     <tr>
         <td><b>Select Playlist</b></td>
         <td>
-            <select name="gunid" multiple>
+            <select name="gunid">
                 {foreach from=$SCHEDULER->playlists item="_pl"}
                     <option value="{$_pl.gunid}">{$_pl.title}</option>
                 {/foreach}
@@ -118,5 +132,6 @@ function sc_check_int(element)
 {/literal}
 </script>
 
+*}
 </body>
 </html>
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
index 474c4ae71..1f7d9c5f9 100755
--- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl
@@ -6,11 +6,11 @@
 <table border="1">
 
 <tr>
-    <td rowspan="3"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> </td>
+    <td rowspan="3" valign="top"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> </td>
     {foreach from=$SCHEDULER->Week item="_Day"}
-        <th colspan="2" width="100">{$_Day.label.full}</th>
+        <th colspan="2" width="100"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">{$_Day.label.full}</a></th>
     {/foreach}
-    <td rowspan="3"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=%2B%2B')">>></a></td>
+    <td rowspan="3" valign="top"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=%2B%2B')">>></a></td>
 </tr>
 
 <tr>
@@ -24,6 +24,10 @@
 <tr>
 {foreach from=$SCHEDULER->Week item="_Day"}
     {assign var="_oneday" value=$SCHEDULER->getDayTiming($_Day.year, $_Day.month, $_Day.day)}
+    {assign var="_year"  value=$_Day.year}
+    {assign var="_month" value=$_Day.month}
+    {assign var="_day"   value=$_Day.day}
+    {assign var="_hour"  value=$_Day.hour}
 
     <td valign="top">
         <table border="1" cellspacing="0" cellpadding="0">
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
index 616a66934..4b95a0ec7 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
@@ -85,8 +85,7 @@ function menu(param) {
             break;
 
             case "SCHEDULER.schedule":
-                //menuHtml = menuHtml + "<tr><td><a class='menu' href='#' onClick=\"hpopup('{/literal}{$UI_HANDLER}{literal}?act=SCHEDULER.set&view=schedule&hour="+param+"')\" "+oF+">&nbsp;Schedule Playlist&nbsp;</a></td></tr>";
-                menuHtml = menuHtml + "<tr><td><a class='menu' href='#' {/literal}onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&hour="+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.schedule', 'Schedule', 600, 400)\"'){literal}"+oF+">&nbsp;Schedule Playlist&nbsp;</a></td></tr>";
+                menuHtml = menuHtml + "<tr><td><a class='menu' href='#' {/literal}onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&"+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.schedule', 'Schedule', 600, 400)\"'){literal}"+oF+">&nbsp;Schedule Playlist&nbsp;</a></td></tr>";
 
             break;
         }
diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl
index 13b4c38aa..69fe078df 100755
--- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl
+++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl
@@ -23,8 +23,14 @@
         {$STATIONPREFS.frequency}
     </div>
 
+    <div class="statusbaritem">
+        {$SCHEDULER->getNowNextClip()}
+        <br>
+        {$STATIONPREFS.frequency}
+    </div>
+
     <div class="statusbaritem">
         {include file="userinfo.tpl"}
     </div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/livesupport/modules/htmlUI/var/ui_browse.class.php b/livesupport/modules/htmlUI/var/ui_browse.class.php
index f82c4de66..9039be317 100755
--- a/livesupport/modules/htmlUI/var/ui_browse.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browse.class.php
@@ -12,7 +12,7 @@ class uiBrowse
         $this->criteria['limit'] ? NULL : $this->criteria['limit'] = 5;
 
         if (!is_array($this->col)) {
-            $this->col[1]['category'] = 'ls:genre';
+            $this->col[1]['category'] = 'dc:type';
             $this->col[2]['category'] = 'dc:creator';
             $this->col[3]['category'] = 'dc:source';
             for ($col=1; $col<=3; $col++) {
@@ -43,7 +43,7 @@ class uiBrowse
     function browseForm($id, $mask2)
     {
         include dirname(__FILE__).'/formmask/metadata.inc.php';
-        $mask2['browse_columns']['category']['options'][0] = tra('Select a Value');
+        #$mask2['browse_columns']['category']['options'][0] = tra('Select a Value');
         foreach ($mask['pages'] as $key=>$val) {
             foreach ($mask['pages'][$key] as $v){
                 if ($v['type']) $mask2['browse_columns']['category']['options'][$this->Base->_formElementEncode($v['element'])] = tra($v['label']);
diff --git a/livesupport/modules/htmlUI/var/ui_calendar.class.php b/livesupport/modules/htmlUI/var/ui_calendar.class.php
index 4ad24a800..79195d9a2 100755
--- a/livesupport/modules/htmlUI/var/ui_calendar.class.php
+++ b/livesupport/modules/htmlUI/var/ui_calendar.class.php
@@ -4,12 +4,12 @@ class uiCalendar
 
     function uiCalendar()
     {
-        $this->firstDayOfWeek = 1;
+
     }
 
     function buildDecade()
     {
-        for ($Year=$this->curr['year']-3; $Year<=$this->curr['year']+5; $Year++) {
+        for ($Year = $this->curr['year']-5; $Year<=$this->curr['year']+5; $Year++) {
             $this->Decade[] = array(
                                 'year'          => $Year,
                                 'isSelected'    => $Year==$this->curr['year'] ? TRUE : FALSE
@@ -29,7 +29,7 @@ class uiCalendar
         $sel =   new Calendar_Month($this->curr['year'], $this->curr['month']);
         $selections = array($sel);
 
-        $Year->build($selections, $this->firstDayOfWeek);
+        $Year->build($selections, UI_SCHEDULER_FIRSTWEEKDAY);
         while ($Month = $Year->fetch()) {
             $this->Year[] = array(
                                 'month'         => sprintf('%02d', $Month->thisMonth()),
@@ -47,7 +47,7 @@ class uiCalendar
         require_once 'Calendar/Month/Weekdays.php';
         require_once 'Calendar/Day.php';
 
-        $Month = new Calendar_Month_Weekdays($this->curr['year'], $this->curr['month'], $this->firstDayOfWeek);
+        $Month = new Calendar_Month_Weekdays($this->curr['year'], $this->curr['month'], UI_SCHEDULER_FIRSTWEEKDAY);
         $Month->build($this->_scheduledDays('month'));                                                       ## scheduled days are selected
         while ($Day = $Month->fetch()) {
             $corrMonth = $Day->thisMonth()<=12 ? sprintf('%02d', $Day->thisMonth()) : '01';   ## due to bug in
@@ -62,7 +62,8 @@ class uiCalendar
                                 'isFirst'       => $Day->isFirst(),
                                 'isLast'        => $Day->isLast(),
                                 'isSelected'    => $Day->isSelected(),
-                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE
+                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE,
+                                'timestamp'     => $Day->thisDay(TRUE)
                              );
         }
     }
@@ -74,7 +75,7 @@ class uiCalendar
 
         require_once 'Calendar/Week.php';
 
-        $Week = new Calendar_Week ($this->curr['year'], $this->curr['month'], $this->curr['day'], $this->firstDayOfWeek);
+        $Week = new Calendar_Week ($this->curr['year'], $this->curr['month'], $this->curr['day'], UI_SCHEDULER_FIRSTWEEKDAY);
         $Week->build($this->_scheduledDays('week'));
         while ($Day = $Week->fetch()) {
             $this->Week[] = array(
@@ -84,7 +85,8 @@ class uiCalendar
                                 'year'          => $Day->thisYear(),
                                 'label'         => $this->_getDayName($Day),
                                 'isSelected'    => $Day->isSelected(),
-                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE
+                                'isCurrent'     => $Day->thisDay()==$this->curr['day'] ? TRUE : FALSE,
+                                'timestamp'     => $Day->thisDay(TRUE)
                             );
         }
     }
@@ -99,8 +101,16 @@ class uiCalendar
         $Day = new Calendar_Day ($this->curr['year'], $this->curr['month'], $this->curr['day']);
         $Day->build();
         while ($Hour = $Day->fetch()) {
-            $this->Day[] = array('hour'         => $Hour->thisHour(),
-                                 'timestamp'    => $Hour->thisHour(TRUE));
+            $this->Day[] = array(
+                                'day'          => sprintf('%02d', $Hour->thisDay()),
+                                'week'         => $this->_getWeekNr($Hour),
+                                'month'        => sprintf('%02d', $Hour->thisMonth()),
+                                'year'         => $Hour->thisYear(),
+                                'hour'         => $Hour->thisHour(),
+                                'isSelected'   => $Hour->isSelected(),
+                                'isCurrent'    => $Hour->thisDay()==$this->curr['day'] ? TRUE : FALSE,
+                                'timestamp'    => $Hour->thisHour(TRUE)
+                           );
         }
 
     }
@@ -113,7 +123,16 @@ class uiCalendar
         $Hour = new Calendar_Hour ($this->curr['year'], $this->curr['month'], $this->curr['day'], $this->curr['hour']);
         $Hour->build();
         while ($Min = $Hour->fetch()) {
-            $this->Hour[] = $Min->thisMinute();
+            $this->Hour[] = array(
+                                'day'          => sprintf('%02d', $Min->thisDay()),
+                                'week'         => $this->_getWeekNr($Min),
+                                'month'        => sprintf('%02d', $Min->thisMonth()),
+                                'year'         => $Min->thisYear(),
+                                'hour'         => $Min->thisHour(),
+                                'minute'       => $Min->thisMinute(),
+                                'isSelected'   => $Min->isSelected(),
+                                'isCurrent'    => $Min->thisDay()==$this->curr['day'] ? TRUE : FALSE
+                            );
         }
     }
 
diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php
index f1c7b1dee..7f33ddef1 100755
--- a/livesupport/modules/htmlUI/var/ui_conf.php
+++ b/livesupport/modules/htmlUI/var/ui_conf.php
@@ -36,6 +36,21 @@ define('UI_MDATA_KEY_CREATOR',    'dc:creator');
 define('UI_MDATA_KEY_DURATION',   'dcterms:extent');
 define('UI_MDATA_KEY_URL',        'ls:url');
 
+## Simple Search Preferences
+define('UI_SIMPLESEARCH_FILETYPE',  'File');
+define('UI_SIMPLESEARCH_OPERATOR',  'OR');
+define('UI_SIMPLESEARCH_LIMIT',     5);
+define('UI_SIMPLESEARCH_ROWS',      3);
+define('UI_SIMPLESEARCH_CAT1',      'dc:title');
+define('UI_SIMPLESEARCH_OP1',       'partial');
+define('UI_SIMPLESEARCH_CAT2',      'dc:creator');
+define('UI_SIMPLESEARCH_OP2',       'partial');
+define('UI_SIMPLESEARCH_CAT3',      'dc:source');
+define('UI_SIMPLESEARCH_OP3',       'partial');
+
+## Scheduler / Calendar
+define('UI_SCHEDULER_FIRSTWEEKDAY', 1);
+
 require_once dirname(__FILE__).'/../../storageServer/var/conf.php';
 ## LS classes/functions #############################################
 require_once dirname(__FILE__).'/ui_base.inc.php';
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
index 1ae1fb170..375edf5ff 100755
--- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
@@ -36,7 +36,7 @@ class uiScheduler extends uiCalendar
         if (is_numeric($month))
                     $this->curr['month'] = sprintf('%02d', $month);
 
-        $stampNow    = $this->_datetime2timestamp($this->curr['year'].$this->curr['month'].$this->curr['day']);
+        $stampNow    = $this->_datetime2timestamp($this->curr['year'].$this->curr['month'].$this->curr['day'].'T'.$this->curr['hour'].':00:00');
         $stampTarget = $stampNow;
         if ($month=='++')
             $stampTarget = strtotime("+1 month", $stampNow);
@@ -46,9 +46,15 @@ class uiScheduler extends uiCalendar
             $stampTarget = strtotime("+1 week", $stampNow);
         if ($week=='--')
             $stampTarget = strtotime("-1 week", $stampNow);
+        if ($today)
+            $stampTarget = time();
+
         $this->curr['year']     = strftime("%Y", $stampTarget);
         $this->curr['month']    = strftime("%m", $stampTarget);
         $this->curr['day']      = strftime("%d", $stampTarget);
+        $this->curr['hour']     = strftime("%H", $stampTarget);
+
+        #print_r($this->curr);
     }
 
 
@@ -162,6 +168,49 @@ class uiScheduler extends uiCalendar
     }
 
 
+    function getScheduleForm()
+    {
+        global $ui_fmask;
+        foreach ($this->playlists as $val)
+            $ui_fmask['schedule']['playlist']['options'][$val['gunid']] = $val['title'];
+        #print_r($ui_fmask);
+        $form = new HTML_QuickForm('schedule', UI_STANDARD_FORM_METHOD, UI_HANDLER);
+        $this->Base->_parseArr2Form($form, $ui_fmask['schedule']);
+        $settime = array('H' => $this->curr['hour']);
+        $setdate = array('Y' => $this->curr['year'],
+                         'm' => $this->curr['month'],
+                         'd' => $this->curr['day']);
+        $form->setDefaults(array('time'     => $settime,
+                                 'date'     => $setdate,
+                                 'playlist' => $setplaylist));
+        $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
+        $form->accept($renderer);
+        $output = $renderer->toArray();
+        #print_r($output);
+        return $output;
+
+    }
+
+
+    function _copyPlFromSP()
+    {
+        if (!count($this->Base->SCRATCHPAD->get()))
+            return FALSE;
+        foreach ($this->Base->SCRATCHPAD->get() as $val) {
+            if (strtolower($val['type'])=='playlist' && $val['id']!=$this->Base->PLAYLIST->activeId)
+                $this->playlists[] = $val;
+        }
+        return TRUE;
+    }
+
+
+    function getNowNextClip()
+    {
+        $playingNow = $this->GeneratePlayReportMethod(strftime('%Y%m%dT%H:%M:%S'), strftime('%Y%m%dT%H:%M:%S'));
+        #print_r ($playingNow);
+    }
+
+
     function _oneOrMore($in)
     {
         return $id < 1 ? ceil($in) : round($in);
@@ -238,14 +287,6 @@ class uiScheduler extends uiCalendar
     }
 
 
-    function copyPlFromSP()
-    {
-        foreach ($this->Base->SCRATCHPAD->get() as $val) {
-            if (strtolower($val['type'])=='playlist' && $val['id']!=$this->Base->PLAYLIST->activeId)
-                $this->playlists[] = $val;
-        }
-    }
-
     function _isError($r)
     {
         if (is_array($r['error'])) {
@@ -264,10 +305,14 @@ class uiScheduler extends uiCalendar
 
 
     function uploadPlaylistMethod(&$formdata)
-    {
-        $gunid = $formdata['gunid'];
-        $datetime = $this->curr['year'].$this->curr['month'].$this->curr['day'].'T'.$formdata['time'];
-        #echo "Schedule Gunid: $gunid  At: ".$datetime;
+    {    print_r($formdata);
+        #$gunid = $formdata['gunid'];
+        #$datetime = $this->curr['year'].$this->curr['month'].$this->curr['day'].'T'.$formdata['time'];
+
+        $gunid = $formdata['playlist'];
+        $datetime = $formdata['date']['Y'].sprintf('%02d', $formdata['date']['m']).sprintf('%02d', $formdata['date']['d']).'T'.sprintf('%02d', $formdata['time']['H']).':'.sprintf('%02d', $formdata['time']['i']).':'.sprintf('%02d', $formdata['time']['s']);
+
+        echo "Schedule Gunid: $gunid  At: ".$datetime;
         $r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime.UI_TIMEZONE);
         #print_r($r);
         if ($this->_isError($r))
@@ -297,5 +342,18 @@ class uiScheduler extends uiCalendar
             return FALSE;
         return $r;
     }
+
+
+    function GeneratePlayReportMethod($from, $to)
+    {
+        #$from = '2005-03-01T00:00:00';
+        #$to   = '2005-03-31T00:00:00';
+        #echo $from.$to;
+        $r = $this->spc->GeneratePlayReportMethod($this->Base->sessid, $from, $to);
+        if ($this->_isError($r))
+            return FALSE;
+        #print_r($r);
+        return $r;
+    }
 }
 ?>
diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php
index 5f0f52222..202880efc 100755
--- a/livesupport/modules/htmlUI/var/ui_search.class.php
+++ b/livesupport/modules/htmlUI/var/ui_search.class.php
@@ -29,6 +29,7 @@ class uiSearch
 
     function searchForm($id, &$mask2)
     {
+        #print_r($this->criteria['form']);
         include dirname(__FILE__).'/formmask/metadata.inc.php';
         $form = new HTML_QuickForm('search', UI_STANDARD_FORM_METHOD, UI_HANDLER);
         $form->setConstants(array('id'=>$id, 'counter'=>$this->criteria['counter'] ? $this->criteria['counter'] : UI_SEARCH_MIN_ROWS));
@@ -86,25 +87,74 @@ class uiSearch
                 $this->criteria['counter']++;
                 $this->criteria['conditions'][$key] = array('cat' => $this->Base->_formElementDecode($val[0]),
                                                             'op'  => $val[1],
-                                                            'val' => stripslashes($val[2]));
+                                                            'val' => stripslashes($val[2])
+                                                      );
                 $this->criteria['form'][$key]       = array(0     => $val[0],
                                                             1     => $val[1],
-                                                            2     => stripslashes($val[2]));
+                                                            2     => stripslashes($val[2])
+                                                      );
             }
         }
         $this->Base->redirUrl = UI_BROWSER.'?act=SEARCH';
         $this->searchDB();
     }
 
+
+    function simpleSearchForm(&$mask)
+    {
+        $form = new HTML_QuickForm('simplesearch', UI_STANDARD_FORM_METHOD, UI_HANDLER);
+        $this->Base->_parseArr2Form($form, $mask);
+        $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
+        $form->accept($renderer);
+        $output = $renderer->toArray();
+        #print_r($output);
+        return $output;
+
+    }
+
+
+    function simpleSearch(&$formdata)
+    {
+        $this->results                  = NULL;
+        $this->criteria['conditions']   = NULL;
+        $this->criteria['offset']       = NULL;
+
+        $this->criteria['operator']         = UI_SIMPLESEARCH_FILETYPE;
+        $this->criteria['filetype']         = UI_SIMPLESEARCH_OPERATOR;
+        $this->criteria['limit']            = UI_SIMPLESEARCH_LIMIT;
+        $this->criteria['counter']          = UI_SIMPLESEARCH_ROWS;
+        $this->criteria['form']['operator'] = 'OR';    ## $criteria['form'] is used for retransfer to form ##
+        $this->criteria['form']['filetype'] = 'File';
+        $this->criteria['form']['limit']    = 5;
+
+        for ($n = 1; $n<=UI_SIMPLESEARCH_ROWS; $n++) {
+            $this->criteria['conditions'][$n] = array('cat'     => constant('UI_SIMPLESEARCH_CAT'.$n),
+                                                      'op'      => constant('UI_SIMPLESEARCH_OP'.$n),
+                                                      'val'     => stripslashes($formdata['criterium'])
+                                               );
+            $this->criteria['form']['row_'.$n]       = array(0     => $this->Base->_formElementEncode(constant('UI_SIMPLESEARCH_CAT'.$n)),
+                                                      1     => constant('UI_SIMPLESEARCH_OP'.$n),
+                                                      2     => stripslashes($formdata['criterium'])
+                                               );
+        }
+        $this->Base->redirUrl = UI_BROWSER.'?act=SEARCH';
+        $this->searchDB();
+    }
+
+
     function searchDB()
     {
         $this->results = array('page' => $this->criteria['offset']/$this->criteria['limit']);
+        #print_r($this->criteria);
         $results = $this->Base->gb->localSearch($this->criteria, $this->Base->sessid);
+        if (PEAR::isError($results)) {
+            #print_r($results);
+            return FALSE;
+        }
         foreach ($results['results'] as $rec) {
             $this->results['items'][] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($rec));
         }
         $this->results['cnt'] = $results['cnt'];
-        #print_r($this->criteria);
         #print_r($this->results);
         $this->pagination($results);
     }