|
diff --git a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
index 7d27580ce..38ef6d4ff 100755
--- a/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
+++ b/livesupport/modules/htmlUI/var/templates/scratchPad.tpl
@@ -1,4 +1,4 @@
-{*Smarty template*}
+{PL->getActiveId assign=_PL_activeId}
%%ScratchPad%%
@@ -18,7 +18,7 @@
|
- {if $PLid == $i.id}
+ {if $_PL_activeId == $i.id}
{$i.title|truncate:30}
{else}
{$i.title|truncate:30}
diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl
index 0f62ce7b0..6b0322eb1 100755
--- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl
@@ -49,7 +49,7 @@
}
{/literal}
- {uiBrowser->getAlertMsg assign='alertMsg'}
+ {UIBROWSER->getAlertMsg assign='alertMsg'}
{if $alertMsg}
alert('{$alertMsg}');
{/if}
diff --git a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
index db0e9de99..7576ebc64 100755
--- a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
+++ b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
@@ -1,9 +1,11 @@
+{PL->getActiveId assign=_PL_activeId}
+
onMouseOver="highlight()"
onMouseOut="darklight()"
onContextmenu="return menu('{$i.id}'
{$moreContextBefore}
{if ($i.type == 'audioclip' || $i.type == 'webstream')}
- {if $PLid}
+ {if $_PL_activeId}
, 'PL.addItem'
{else}
, 'PL.create'
@@ -12,8 +14,8 @@ onContextmenu="return menu('{$i.id}'
{/if}
{if ($i.type == 'playlist')}
- {if $PLid}
- {if $PLid == $i.id}
+ {if $_PL_activeId}
+ {if $_PL_activeId == $i.id}
, 'PL.release'
{else}
, 'PL.addItem', 'delete'
diff --git a/livesupport/modules/htmlUI/var/ui_browse.class.php b/livesupport/modules/htmlUI/var/ui_browse.class.php
index 8b3bd66c8..0e15e9c94 100755
--- a/livesupport/modules/htmlUI/var/ui_browse.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browse.class.php
@@ -5,13 +5,18 @@ class uiBrowse
{
$this->Base =& $uiBase;
$this->col =& $_SESSION[UI_BROWSE_SESSNAME]['col'];
+ $this->criteria =& $_SESSION[UI_BROWSE_SESSNAME]['criteria'];
$this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
+ $this->criteria['limit'] ? NULL : $this->criteria['limit'] = 5;
+
if (!is_array($this->col)) {
- #$this->col[1]['category'] = 'dc:genre';
- #$this->col[2]['category'] = 'dc:creator';
- #$this->col[3]['category'] = 'dc:title';
- #$this->setCategory(array('col' => 1, 'category' => $this->col[1]['category']));
+ $this->col[1]['category'] = 'ls:genre';
+ $this->col[2]['category'] = 'dc:creator';
+ $this->col[3]['category'] = 'dc:source';
+ for ($col=1; $col<=3; $col++) {
+ $this->setCategory(array('col' => $col, 'category' => $this->col[$col]['category']));
+ }
}
#print_r($this->col);
}
@@ -26,25 +31,36 @@ class uiBrowse
function browseForm($id, $mask2)
{
include dirname(__FILE__).'/formmask/metadata.inc.php';
- $mask2['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['category']['options'][$this->Base->_formElementEncode($v['element'])] = tra($v['label']);
+ if ($v['type']) $mask2['browse_columns']['category']['options'][$this->Base->_formElementEncode($v['element'])] = tra($v['label']);
}
};
for($n=1; $n<=3; $n++) {
$form = new HTML_QuickForm('col'.$n, UI_STANDARD_FORM_METHOD, UI_HANDLER);
$form->setConstants(array('id' => $id, 'col' => $n, 'category' => $this->Base->_formElementEncode($this->col[$n]['category'])));
- $mask2['value']['options'] = $this->_options($this->col[$n]['values']['results']);
- $mask2['value']['default'] = $this->col[$n]['form_value'];
- $this->Base->_parseArr2Form($form, $mask2);
+ $mask2['browse_columns']['value']['options'] = $this->options($this->col[$n]['values']['results']);
+ $mask2['browse_columns']['value']['default'] = $this->col[$n]['form_value'];
+ $this->Base->_parseArr2Form($form, $mask2['browse_columns']);
$form->validate();
$renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer);
- $output[$n]['dynform'] = $renderer->toArray();
+ $output['col'.$n]['dynform'] = $renderer->toArray();
}
- #print_r($output);
+
+ ## just to change limit and file-type
+ $form = new HTML_QuickForm('shitcher', UI_STANDARD_FORM_METHOD, UI_HANDLER);
+ #$mask2['browse_global']['limit']['default'] = $this->criteria['limit'];
+ #$mask2['browse_global']['filetype']['default'] = $this->criteria['filetype'];
+ $this->Base->_parseArr2Form($form, $mask2['browse_global']);
+ $form->setDefaults(array('limit' => $this->criteria['limit'],
+ 'filetype' => $this->criteria['filetype']));
+ $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
+ $form->accept($renderer);
+ $output['global']['dynform'] = $renderer->toArray();
+
return $output;
}
@@ -93,7 +109,7 @@ class uiBrowse
}
- function _options($arr)
+ function options($arr)
{ $ret['%%all%%'] = '---all---';
if (is_array($arr)) {
foreach ($arr as $val)
@@ -117,20 +133,85 @@ class uiBrowse
function getResult()
{
+ $this->results = NULL;
for($col=4; $col>=1; $col--) {
if (is_array($this->col[$col]['criteria'])) {
- #echo $col; print_r($this->col[$col]['criteria']);
+ $this->criteria = array_merge ($this->criteria, $this->col[$col]['criteria']);
break;
}
}
- $results = $this->Base->gb->localSearch($this->col[$col]['criteria'], $this->Base->sessid);
- $this->results['count'] = $results['cnt'];
+ $results = $this->Base->gb->localSearch($this->criteria, $this->Base->sessid);
+ #$this->results['count'] = $results['cnt'];
foreach ($results['results'] as $rec) {
$this->results['items'][] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($rec));
}
+ $this->pagination($results);
#print_r($this->results);
return $this->results;
}
+
+ function pagination(&$results)
+ {
+ if (sizeof($this->results) == 0) {
+ return FALSE;
+ }
+ $this->results['count'] = $results['cnt'];
+ $this->results['next'] = $results['cnt'] > $this->criteria['offset'] + $this->criteria['limit'] ? TRUE : FALSE;
+ $this->results['prev'] = $this->criteria['offset'] > 0 ? TRUE : FALSE;
+
+ $p = 1;
+ for ($n = 1; $n <= ceil($results['cnt'] / $this->criteria['limit']); $n = $n+$p) {
+ $p = bcpow(10, floor($n/10));
+ $this->results['pages'][$n-1] = $n;
+ }
+
+ array_pop($this->results['pages']);
+ $this->results['pages'][ceil($results['cnt'] / $this->criteria['limit'])-1] = '>>';
+ }
+
+
+ function reOrder($by)
+ {
+ $this->criteria['offset'] = NULL;
+
+ if ($this->criteria['orderby'] == $by && !$this->criteria['desc'])
+ $this->criteria['desc'] = TRUE;
+ else
+ $this->criteria['desc'] = FALSE;
+
+ $this->criteria['orderby'] = $by;
+ $this->setReload();
+ #$this->searchDB();
+ }
+
+
+ function setOffset($page)
+ {
+ $o =& $this->criteria['offset'];
+ $l =& $this->criteria['limit'];
+
+ if ($page == 'next') {
+ $o += $l;
+ } elseif ($page == 'prev') {
+ $o -= $l;
+ } elseif (is_numeric($page)) {
+ $o = $l * $page;
+ }
+ $this->setReload();
+ #$this->searchDB();
+ }
+
+ function setLimit($limit)
+ {
+ $this->criteria['limit'] = $limit;
+ $this->setReload();
+ }
+
+ function setFiletype($filetype)
+ {
+ $this->criteria['filetype'] = $filetype;
+ $this->setReload();
+ }
}
?>
diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php
index 38973b6e0..1b660722b 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -23,6 +23,14 @@ class uiPlaylist
return $this->Base->gb->getPlaylistArray($this->activeId, $this->Base->sessid);
}
+ function getActiveId()
+ {
+ if (!$this->activeId) {
+ return FALSE;
+ }
+ return $this->activeId;
+ }
+
function activate($plid, $msg=TRUE)
{
# test if PL available
diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php
index 09b905267..421ed1d81 100755
--- a/livesupport/modules/htmlUI/var/ui_search.class.php
+++ b/livesupport/modules/htmlUI/var/ui_search.class.php
@@ -20,7 +20,7 @@ class uiSearch
return $this->results;
}
- function form($id, &$mask2)
+ function searchForm($id, &$mask2)
{
include dirname(__FILE__).'/formmask/metadata.inc.php';
$form = new HTML_QuickForm('search', UI_STANDARD_FORM_METHOD, UI_HANDLER);
| |