From 47c9f398ee85aaa9ca3cd601eaef98475eb3faf8 Mon Sep 17 00:00:00 2001 From: sebastian Date: Thu, 24 Mar 2005 13:23:52 +0000 Subject: [PATCH] micz?s template changes --- .../htmlUI/var/formmask/generic.inc.php | 2 +- .../modules/htmlUI/var/templates/filedata.tpl | 1 - .../var/templates/library/browseForm.tpl | 54 ++------------- .../htmlUI/var/templates/library/main.tpl | 15 +++-- .../htmlUI/var/templates/library/results.tpl | 65 ++----------------- .../var/templates/library/searchForm.tpl | 4 +- .../htmlUI/var/templates/loader/index.tpl | 2 +- .../htmlUI/var/templates/masterpanel.tpl | 3 + .../modules/htmlUI/var/templates/menu.tpl | 48 +++++++------- .../var/templates/playlist/metadata.tpl | 4 +- .../htmlUI/var/templates/popup/login.tpl | 3 - .../htmlUI/var/templates/popup/logout.tpl | 6 +- .../htmlUI/var/templates/scratchpad.tpl | 4 +- 13 files changed, 56 insertions(+), 155 deletions(-) diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php index c7eadffcc..ee56e6305 100755 --- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php @@ -27,7 +27,7 @@ $ui_fmask = array( 'element' => 'stationName', 'isPref' => TRUE, 'type' => 'text', - 'label' => 'Staion Name', + 'label' => 'Station Name', 'required' => TRUE ), array( diff --git a/livesupport/modules/htmlUI/var/templates/filedata.tpl b/livesupport/modules/htmlUI/var/templates/filedata.tpl index bc72a49e9..fb65ee08f 100755 --- a/livesupport/modules/htmlUI/var/templates/filedata.tpl +++ b/livesupport/modules/htmlUI/var/templates/filedata.tpl @@ -1,4 +1,3 @@ -{* Smarty template *}
{include file="sub/x.tpl"}
diff --git a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl index 0cd76ffe6..39b3746dc 100755 --- a/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/browseForm.tpl @@ -1,10 +1,7 @@ {assign var="_style_select" value=" style='width: 180px;'"} {assign var="_style_textarea" value=" class='area_browse'"} - -
-

Browse

- +
{foreach from=$browseForm.col1 item=dynform} @@ -24,50 +21,7 @@ {foreach from=$browseForm.global item=dynform} {include file="sub/dynForm_plain.tpl"} {/foreach} - - + + {assign var="_style_select" value=""} -{assign var="_style_textarea" value=""} -{* -{literal} - -{/literal} -
-{include file="sub/x.tpl"} - - - - - - - - - - - - - -
- {foreach from=$browseForm.col1 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} - - {foreach from=$browseForm.col2 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} - - {foreach from=$browseForm.col3 item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} -
- {foreach from=$browseForm.global item=dynform} - {include file="sub/dynForm_plain.tpl"} - {/foreach} -
- -
-*} \ No newline at end of file +{assign var="_style_textarea" value=""} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/library/main.tpl b/livesupport/modules/htmlUI/var/templates/library/main.tpl index fffbf0de8..48990f265 100755 --- a/livesupport/modules/htmlUI/var/templates/library/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/main.tpl @@ -1,11 +1,14 @@ {if $searchForm} -
+
+ +
+

##Search##

{assign var="_act_prefix" value="SEARCH"} {include file="library/searchForm.tpl"} {SEARCH->getResult assign=_results} @@ -15,11 +18,14 @@ {if $browseForm}
+ +
+

Browse

{assign var="_act_prefix" value="BROWSE"} {include file="library/browseForm.tpl"} {BROWSE->getResult assign=_results} @@ -27,4 +33,5 @@ {/if} {include file="library/results.tpl"} +
\ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/library/results.tpl b/livesupport/modules/htmlUI/var/templates/library/results.tpl index e85c263a6..6fb6ff454 100755 --- a/livesupport/modules/htmlUI/var/templates/library/results.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/results.tpl @@ -1,7 +1,7 @@ {if $_results.cnt > 0}
 
-
+
@@ -24,14 +24,14 @@ - + {/foreach}
{$i.creator} {$i.duration}{$i.type}{$i.type}
-
+
{if $_results.prev}##previous##{/if} @@ -56,61 +56,4 @@ {else} ##No match found.## -{/if} - - -{* -
-
-{if $_results.cnt > 0} - - - - - - - - {foreach from=$_results.items item=i} - - - - - - - {/foreach} - - - - - - -
##Title####Creator####Duration####Type##
- {if $PLAYLIST.id == $i.id} - {$i.title|truncate:30} - {else} - {$i.title|truncate:30} - {/if} - {$i.creator}{$i.duration}{$i.type}
- {if $_results.prev}backward{/if} - - Count: {$_results.cnt} - - Page:  {$_results.page+1} - - Range: {$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if} - - go: - {foreach from=$_results.pagination item=p key=k} - {$p} - {/foreach} - - {if $_results.next}forward{/if} -
-
-{else} - ##No match found.## -{/if} - -
- -*} +{/if} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl b/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl index 680e53fbc..6f3a05c25 100755 --- a/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/searchForm.tpl @@ -1,7 +1,5 @@ {include file="library/searchForm.js.tpl"} {foreach from=$searchForm item=dynform} -
-

##Search##

{include file="sub/dynForm_plain.tpl"} -
+ {/foreach} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/loader/index.tpl b/livesupport/modules/htmlUI/var/templates/loader/index.tpl index f2461a35b..4ca0b8a9d 100755 --- a/livesupport/modules/htmlUI/var/templates/loader/index.tpl +++ b/livesupport/modules/htmlUI/var/templates/loader/index.tpl @@ -3,7 +3,7 @@
-
+
diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index c0dc10b84..29fd5bfd1 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -14,13 +14,16 @@ *} {if $showScheduler} +
{include file="scheduler/calendar.tpl"} {if $SCRATCHPAD} {include file="scratchpad.tpl"} {/if}
+ 		{include file="scheduler/main.tpl"} +
{else} {if $fileList} diff --git a/livesupport/modules/htmlUI/var/templates/menu.tpl b/livesupport/modules/htmlUI/var/templates/menu.tpl index 81887957b..9e6b547fe 100755 --- a/livesupport/modules/htmlUI/var/templates/menu.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu.tpl @@ -1,33 +1,31 @@
- -{* - - -*} \ No newline at end of file + \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl index c695c67f1..6529ada7a 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl @@ -1,3 +1,5 @@ +
+

##Playlist Metadata##

{assign var="_form" value=$PL->metaDataForm($_PL.curr_langid)} {assign var="dynform" value=$_form.langswitch} @@ -5,7 +7,7 @@ {assign var="dynform" value=$_form.main} {include file="sub/dynForm_plain.tpl"} - +