From: <mar...@us...> - 2012-04-01 22:47:32
|
Revision: 40626 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40626&view=rev Author: marclaporte Date: 2012-04-01 22:47:25 +0000 (Sun, 01 Apr 2012) Log Message: ----------- More consistent and less jargon for various buttons related to Kaltura Video management in Tiki Modified Paths: -------------- trunk/templates/admin/include_video.tpl trunk/templates/tiki-kaltura_upload.tpl trunk/templates/tiki-kaltura_video.tpl trunk/templates/tiki-list_kaltura_browse_entries.tpl trunk/templates/tiki-list_kaltura_entries.tpl Modified: trunk/templates/admin/include_video.tpl =================================================================== --- trunk/templates/admin/include_video.tpl 2012-04-01 22:23:43 UTC (rev 40625) +++ trunk/templates/admin/include_video.tpl 2012-04-01 22:47:25 UTC (rev 40626) @@ -4,7 +4,7 @@ {tab name="{tr}Kaltura{/tr}"} {remarksbox type="info" title="{tr}Kaltura Registration{/tr}"}{tr}To get a Kaltura Partner ID:{/tr} {tr}Setup your own instance of Kaltura Community Edition (CE){/tr} or <a href="http://corp.kaltura.com/about/signup">{tr}get an account via Kaltura.com{/tr}</a> {/remarksbox} - {button _text="{tr}List Media Entries{/tr}" href="tiki-list_kaltura_entries.php"} + {button _text="{tr}List Media{/tr}" href="tiki-list_kaltura_entries.php"} {if $kaltura_legacyremix eq 'y'}{button _text="{tr}List Remix Entries{/tr}" href="tiki-list_kaltura_entries.php?list=mix"}{/if} {button _text="{tr}Add New Media{/tr}" href="tiki-kaltura_upload.php"} Modified: trunk/templates/tiki-kaltura_upload.tpl =================================================================== --- trunk/templates/tiki-kaltura_upload.tpl 2012-04-01 22:23:43 UTC (rev 40625) +++ trunk/templates/tiki-kaltura_upload.tpl 2012-04-01 22:47:25 UTC (rev 40626) @@ -1,15 +1,15 @@ -{title help="Kaltura" admpage="video"}{tr}Upload to Kaltura{/tr}{/title} +{title help="Kaltura" admpage="video"}{tr}Upload Media{/tr}{/title} <div class="navbar"> {if $tiki_p_list_videos eq 'y'} - {button _text="{tr}List Entries{/tr}" href="tiki-list_kaltura_entries.php"} + {button _text="{tr}List Media{/tr}" href="tiki-list_kaltura_entries.php"} {/if} </div> <script type="text/javascript" src="lib/swfobject/swfobject.js"></script> <br /> {if $count > 0} -{remarksbox type="info" title="{tr}Upload Successful{/tr}"}{tr}You have successfully added {$count} new entry/entries{/tr}{/remarksbox} +{remarksbox type="info" title="{tr}Upload Successful{/tr}"}{tr}You have successfully added {$count} new media{/tr}{/remarksbox} <p> {button _text="{tr}Add more media{/tr}" href="tiki-kaltura_upload.php"} </p> Modified: trunk/templates/tiki-kaltura_video.tpl =================================================================== --- trunk/templates/tiki-kaltura_video.tpl 2012-04-01 22:23:43 UTC (rev 40625) +++ trunk/templates/tiki-kaltura_video.tpl 2012-04-01 22:47:25 UTC (rev 40626) @@ -4,7 +4,7 @@ {else}{tr}Kaltura Video{/tr}{/if}{/title} <div class="navbar"> {if $tiki_p_list_videos eq 'y'} - {button _text="{tr}Media Entries{/tr}" href="tiki-list_kaltura_entries.php"} + {button _text="{tr}List Media{/tr}" href="tiki-list_kaltura_entries.php"} {/if} {if $kmode ne ''} {if $kmode ne 'edit' and ($tiki_p_edit_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y')} Modified: trunk/templates/tiki-list_kaltura_browse_entries.tpl =================================================================== --- trunk/templates/tiki-list_kaltura_browse_entries.tpl 2012-04-01 22:23:43 UTC (rev 40625) +++ trunk/templates/tiki-list_kaltura_browse_entries.tpl 2012-04-01 22:47:25 UTC (rev 40626) @@ -5,15 +5,18 @@ } {/jq} +{if $tiki_p_upload_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'}{button _text="{tr}Add New Media{/tr}" href="tiki-kaltura_upload.php"}{/if} + {if $tiki_p_list_videos eq 'y'} {if $entryType eq "mix"} - {button _text="{tr}List Media Entries{/tr}" href="tiki-list_kaltura_entries.php"} + {button _text="{tr}List Media{/tr}" href="tiki-list_kaltura_entries.php"} {if $prefs.kaltura_legacyremix == 'y'}{button _text="{tr}List Remix Entries{/tr}" href="tiki-list_kaltura_entries.php?list=mix"}{/if} {else} {if $prefs.kaltura_legacyremix == 'y'}{button _text="{tr}List Remix Entries{/tr}" href="tiki-list_kaltura_entries.php?list=mix"}{/if} - {button _text="{tr}List Media Entries{/tr}" href="tiki-list_kaltura_entries.php"} + {button _text="{tr}List Media{/tr}" href="tiki-list_kaltura_entries.php"} {/if} {/if} + <div class="center"> <object name="mykdp" id="mykdp" type="application/x-shockwave-flash" height="365" width="595" data="{$prefs.kaltura_kServiceUrl}index.php/kwidget/wid/_{$prefs.kaltura_partnerId}/uiconf_id/{$prefs.kaltura_kdpUIConf}/entry_id/{$videoInfo->id}"> <param name="allowScriptAccess" value="always" /> Modified: trunk/templates/tiki-list_kaltura_entries.tpl =================================================================== --- trunk/templates/tiki-list_kaltura_entries.tpl 2012-04-01 22:23:43 UTC (rev 40625) +++ trunk/templates/tiki-list_kaltura_entries.tpl 2012-04-01 22:47:25 UTC (rev 40626) @@ -1,5 +1,5 @@ {* $Id$ *} -{title help="Kaltura" admpage="video"}{if $entryType eq "mix"}{tr}Kaltura Remix Entries{/tr}{else}{tr}Kaltura Media Entries{/tr}{/if}{/title} +{title help="Kaltura" admpage="video"}{if $entryType eq "mix"}{tr}Remix Entries{/tr}{else}{if $view ne "browse"}{tr}List Media{/tr}{else}{tr}Browse Media{/tr}{/if}{/if}{/title} {capture name=other_sorts}{strip} <div class='opaque'> @@ -27,11 +27,11 @@ <form action='tiki-list_kaltura_entries.php?list={if $entryType eq "mix"}mix{else}media{/if}' method="post"{if $entryType ne "mix"} id="videoAction"{/if}> {capture assign=btnlink_list}{if $entryType eq "mix"}media{else}mix{/if}{/capture} {if $prefs.kaltura_legacyremix == 'y' || $entryType eq "mix"} - {capture assign=btnlink_text}{if $entryType eq "mix"}{tr}List Media Entries{/tr}{else}{tr}List Remixes{/tr}{/if}{/capture} + {capture assign=btnlink_text}{if $entryType eq "mix"}{tr}Browse Media{/tr}{else}{tr}Browse Remixes{/tr}{/if}{/capture} {button _text=$btnlink_text href="tiki-list_kaltura_entries.php?list=$btnlink_list"} {/if} {if $tiki_p_upload_videos eq 'y' or $tiki_p_admin_kaltura eq 'y' or $tiki_p_admin eq 'y'}{button _text="{tr}Add New Media{/tr}" href="tiki-kaltura_upload.php"}{/if} - {capture assign=btnlink_text}{if $entryType eq "mix"}{tr}Browse Remixes{/tr}{else}{tr}Browse Media Entries{/tr}{/if}{/capture} + {capture assign=btnlink_text}{if $entryType eq "mix"}{tr}Browse Remixes{/tr}{else}{tr}Browse Media{/tr}{/if}{/capture} {button _text=$btnlink_text href="tiki-list_kaltura_entries.php?list=$entryType&view=browse"} {if $entryType eq "mix"}{include file='tiki-list_kaltura_mix_entries.tpl'}{else}{include file='tiki-list_kaltura_media_entries.tpl'}{/if} </form> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |