From: <jon...@us...> - 2009-06-30 14:13:13
|
Revision: 19862 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=19862&view=rev Author: jonnybradley Date: 2009-06-30 14:12:52 +0000 (Tue, 30 Jun 2009) Log Message: ----------- [MRG] Automatic merge, trunk 19854 to 19861 Modified Paths: -------------- branches/experimental/ui-revamp/templates/tiki-objectpermissions.tpl branches/experimental/ui-revamp/templates/tiki-send_newsletters.tpl branches/experimental/ui-revamp/tiki-objectpermissions.php branches/experimental/ui-revamp/tiki-send_newsletters.php Property Changed: ---------------- branches/experimental/ui-revamp/ branches/experimental/ui-revamp/installer/schema/20081125_tiki_tracker_types_tiki.sql branches/experimental/ui-revamp/installer/schema/20090513_calendar_priority_tiki.sql branches/experimental/ui-revamp/installer/schema/20090513_wiki_similar_permission_tiki.sql branches/experimental/ui-revamp/lib/jquery/ branches/experimental/ui-revamp/lib/jquery/cluetip/ branches/experimental/ui-revamp/lib/jquery/jquery-autocomplete/ branches/experimental/ui-revamp/lib/jquery/reflection-jquery/ branches/experimental/ui-revamp/lib/jquery/superfish/ branches/experimental/ui-revamp/lib/jquery_tiki/ branches/experimental/ui-revamp/lib/wiki-plugins/wikiplugin_mediaplayer.php branches/experimental/ui-revamp/templates/tiki-pagecontrols-tab-header.tpl Property changes on: branches/experimental/ui-revamp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter:15787-16031 /trunk:15666-16333,19764-19854 + /branches/experimental/declfilter:15787-16031 /trunk:15666-16333,19764-19861 Property changes on: branches/experimental/ui-revamp/installer/schema/20081125_tiki_tracker_types_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:19767-19854 + /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:19767-19861 Property changes on: branches/experimental/ui-revamp/installer/schema/20090513_calendar_priority_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:19767-19854 + /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:19767-19861 Property changes on: branches/experimental/ui-revamp/installer/schema/20090513_wiki_similar_permission_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:19767-19854 + /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:19767-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery:17151-17198 /branches/experimental/jquery/lib/jquery:16288-17075 /trunk/lib/jquery:19764-19854 + /branches/3.0/lib/jquery:17151-17198 /branches/experimental/jquery/lib/jquery:16288-17075 /trunk/lib/jquery:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery/cluetip ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery/cluetip:17063-17198 /trunk/lib/jquery/cluetip:19764-19854 + /branches/3.0/lib/jquery/cluetip:17063-17198 /trunk/lib/jquery/cluetip:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery/jquery-autocomplete ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery/jquery-autocomplete:17063-17198 /trunk/lib/jquery/jquery-autocomplete:19764-19854 + /branches/3.0/lib/jquery/jquery-autocomplete:17063-17198 /trunk/lib/jquery/jquery-autocomplete:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery/reflection-jquery ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery/reflection-jquery:17063-17198 /trunk/lib/jquery/reflection-jquery:19764-19854 + /branches/3.0/lib/jquery/reflection-jquery:17063-17198 /trunk/lib/jquery/reflection-jquery:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery/superfish ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery/superfish:17063-17198 /trunk/lib/jquery/superfish:19764-19854 + /branches/3.0/lib/jquery/superfish:17063-17198 /trunk/lib/jquery/superfish:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/jquery_tiki ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery_tiki:17151-17198 /branches/experimental/jquery/lib/jquery_tiki:16288-17075 /trunk/lib/jquery_tiki:19764-19854 + /branches/3.0/lib/jquery_tiki:17151-17198 /branches/experimental/jquery/lib/jquery_tiki:16288-17075 /trunk/lib/jquery_tiki:19764-19861 Property changes on: branches/experimental/ui-revamp/lib/wiki-plugins/wikiplugin_mediaplayer.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-17198 /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:19764-19854 /trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737 + /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-17198 /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:19764-19861 /trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737 Modified: branches/experimental/ui-revamp/templates/tiki-objectpermissions.tpl =================================================================== --- branches/experimental/ui-revamp/templates/tiki-objectpermissions.tpl 2009-06-30 13:23:57 UTC (rev 19861) +++ branches/experimental/ui-revamp/templates/tiki-objectpermissions.tpl 2009-06-30 14:12:52 UTC (rev 19862) @@ -1,25 +1,18 @@ {* $Id$ *} -{if $object_page_controls} - {include file='tiki-pagecontrols.tpl' controls=$object_page_controls} -{else} {title help="Permission"}{tr}Assign permissions to {/tr}{tr}{$objectType|escape}{/tr}: {$objectName|escape}{/title} <div class="navbar"> {button href="$referer" _text="{tr}Back{/tr}"} + {button href="tiki-list_object_permissions.php" _text="{tr}Object Permissions List{/tr}"} </div> -{/if} -{if $prefs.feature_tabs eq 'y'} - <div class="tabs" style="clear: both;"> - <span id="tab1" class="tabmark tabactive"><a href="javascript:tikitabs(1,3);">{tr}View Permissions{/tr}</a></span> - <span id="tab2" class="tabmark tabinactive"><a href="javascript:tikitabs(2,3);">{tr}Edit Permissions{/tr}</a></span> - </div> -{/if} +{tabset name='tabs_objectpermissions'} -<fieldset {if $prefs.feature_tabs eq 'y'}id="content1" class="tabcontent" style="clear:both;display:block; margin-left: 0;"{/if}> +{tab name='{tr}View Permissions{/tr}'} + {if $prefs.feature_tabs neq 'y'} - <legend class="heading"><a href="#"><span>{tr}View Permissions{/tr}</span></a></legend> + <h2>{tr}View Permissions{/tr}</h2> {/if} {if $filegals_manager eq ''} {remarksbox type="warning" title="{tr}Warning{/tr}"}{tr}These permissions override any global permissions or category permissions affecting this object.{/tr}<br /> @@ -36,12 +29,13 @@ {section name=pg loop=$page_perms} <tr> <td class="{cycle advance=false}" title="{$page_perms[pg].permName}">{$page_perms[pg].permName|escape}<br /><i>{tr}{$page_perms[pg].permDesc|escape}{/tr}</i></td> -<td class="{cycle advance=false}">{$page_perms[pg].groupName}</td> +<td class="{cycle advance=false}">{if $page_perms[pg].groupName eq $prefs.trackerCreatorGroupName}<i>{tr}Creator Group{/tr}</i>{assign var=commentCreatorGroup value="y"}{else}{$page_perms[pg].groupName|escape}{/if}</td> </tr> {sectionelse} <tr><td colspan="4" class="odd">{if !empty($categ_perms)}{tr}No individual permissions, category permissions apply{/tr}{else}{tr}No individual permissions, category permissions apply{/tr}{/if}</td></tr> {/section} </table> +{if isset($commentCreatorGroup) && $commentCreatorGroup eq 'y'}{remarksbox type="warning" title="{tr}Warning{/tr}"}{tr}Creator group perms apply only if no tiki_p_view_trackers{/tr}{/remarksbox}{/if} <br/> @@ -69,12 +63,12 @@ <tr><td colspan="3">{if empty($page_perms)}{tr}No category permissions; global permissions apply{/tr}{else}{tr}No category permissions; special permissions apply{/tr}{/if}</td></tr> {/section} </table> -</fieldset> +{/tab} +{tab name='{tr}Edit Permissions{/tr}'} -<fieldset {if $prefs.feature_tabs eq 'y'}id="content2" class="tabcontent" style="clear:both;display:block; margin-left:0;"{/if}> {if $prefs.feature_tabs neq 'y'} - <legend class="heading"><a href="#"><span>{tr}Edit Permissions{/tr}</span></a></legend> + <h2>{tr}Edit Permissions{/tr}</h2> {/if} <form method="post" action="tiki-objectpermissions.php{if $filegals_manager neq ''}?filegals_manager={$filegals_manager|escape}{/if}"> {if $filegals_manager eq ''} @@ -85,7 +79,12 @@ <h2>{tr}Current permissions for this object{/tr}</h2> <table class="normal"> <tr> - <th colspan="2">{tr}Permissions{/tr}</th> + <th> + {if $page_perms} + {select_all checkbox_names='checked[]'} + {/if} + </th> + <th>{tr}Permissions{/tr}</th> <th>{tr}Groups{/tr}</th> <th style="width:20px">{tr}Action{/tr}</th> </tr> @@ -99,27 +98,23 @@ {$page_perms[pg].permName|escape}<br /><i>{tr}{$page_perms[pg].permDesc|escape}{/tr}</i> </td> <td class="{cycle advance=false}"> - {$page_perms[pg].groupName} + {if $page_perms[pg].groupName eq $prefs.trackerCreatorGroupName}<i>{tr}Creator Group{/tr}</i>{else}{$page_perms[pg].groupName|escape}{/if} </td> <td class="{cycle advance=true}"><a class="link" href="tiki-objectpermissions.php?referer={$referer|escape:"url"}&action=remove&objectName={$objectName}&objectId={$objectId}&objectType={$objectType}&permType={$permType}&page={$page|escape:"url"}&perm={$page_perms[pg].permName}&group={$page_perms[pg].groupName}{if $filegals_manager neq ''}&filegals_manager={$filegals_manager|escape}{/if}" title="{tr}Delete{/tr}">{icon _id='cross' alt="{tr}Delete{/tr}"}</a></td></tr> {sectionelse} <tr><td colspan="4" class="odd">{if !empty($categ_perms)}{tr}No individual permissions, category permissions apply{/tr}{else}{tr}No individual permissions, category permissions apply{/tr}{/if}</td></tr> {/section} +</table> + {if $page_perms} -<tr> - <td colspan="3"> - <input type="checkbox" id="clickall" title="{tr}Select All{/tr}" onclick="switchCheckboxes(this.form,'checked[]',this.checked)"/> {tr}Select All{/tr} - </td> -</tr> + <div> + {tr}Perform action with checked:{/tr} + <input type="image" name="delsel" src='pics/icons/cross.png' alt='{tr}Delete{/tr}' title='{tr}Delete{/tr}' /> + {if isset($inStructure)} + {tr}and also to all pages of the sub-structure:{/tr} <input name="removestructure" type="checkbox" /> + {/if} + </div> {/if} -</table> -{if $page_perms}<div> -{tr}Perform action with checked:{/tr} -<input type="image" name="delsel" src='pics/icons/cross.png' alt='{tr}Delete{/tr}' title='{tr}Delete{/tr}' /> -{if isset($inStructure)} -{tr}and also to all pages of the sub-structure:{/tr} <input name="removestructure" type="checkbox" /> -{/if} -</div>{/if} <br/> @@ -131,7 +126,7 @@ <input type="hidden" name="objectType" value="{$objectType|escape}" /> <input type="hidden" name="objectId" value="{$objectId|escape}" /> <input type="hidden" name="permType" value="{$permType|escape}" /> -<div class="button" style="text-align: center"> +<div class="input_submit_container" style="text-align: center"> <input type="submit" name="assign" value="{tr}Assign{/tr}" /> </div> @@ -163,9 +158,15 @@ <tr class="{cycle advance=true}"> <td class="{cycle advance=false}"><input type="checkbox" name="group[]" value="{$groups[grp].groupName|escape}" {if $groupName eq $groups[grp].groupName }checked{/if}/> {$groups[grp].groupName|escape}</td></tr> {/section} +{if $group_tracker eq 'y'} +<tr class="{cycle advance=true}"><td><hr /></td></tr> +<tr class="{cycle advance=true}"> + <td class="{cycle advance=false}"><input type="checkbox" name="group[]" value="{$prefs.trackerCreatorGroupName}" {if isset($groupName) and $grouName eq $prefs.trackerCreatorGroupName}checked{/if}/> <i>{tr}Creator Group{/tr}</i></td> +</tr> +{/if} </table></td></tr> </table> -<div class="button" style="text-align: center"> +<div class="input_submit_container" style="text-align: center"> <input type="submit" name="assign" value="{tr}Assign{/tr}" /> </div> {if ($objectType eq 'wiki' or $objectType eq 'wiki page') and !empty($inStructure)} @@ -183,11 +184,7 @@ {/section} </table> -{* <a class="trailer" href="#" {popup sticky=true fullhtml="1" hauto=true vauto=true text=$smarty.capture.add_perm|escape:"javascript"|escape:"html" trigger=onClick} >{tr}Add new Permissions{/tr}</a> *} </div> </form> -</fieldset> - -{if $object_page_controls} - {include file='tiki-pagecontrols-footer.tpl' controls=$object_page_controls} -{/if} +{/tab} +{/tabset} Property changes on: branches/experimental/ui-revamp/templates/tiki-pagecontrols-tab-header.tpl ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/templates/tiki-pagecontrols-tab-header.tpl:16268-16333,19764-19854 + /trunk/templates/tiki-pagecontrols-tab-header.tpl:16268-16333,19764-19861 Modified: branches/experimental/ui-revamp/templates/tiki-send_newsletters.tpl =================================================================== --- branches/experimental/ui-revamp/templates/tiki-send_newsletters.tpl 2009-06-30 13:23:57 UTC (rev 19861) +++ branches/experimental/ui-revamp/templates/tiki-send_newsletters.tpl 2009-06-30 14:12:52 UTC (rev 19862) @@ -4,7 +4,7 @@ {title help="Newsletters"}{tr}Send Newsletters{/tr} {if $nlId ne '0'}{$nlName}{/if}{/title} {if $tiki_p_admin_newsletters eq "y"} - <div class="navbar"> + <div class="navbar"> {if $nlId} {button href="tiki-admin_newsletters.php?nlId=$nlId" _text="{tr}Admin Newsletters{/tr}"} {else} @@ -13,252 +13,292 @@ </div> {/if} +{if $upload_err_msg neq ''} + {remarksbox type='warning' title="{tr}Warning{/tr}" icon='error'} + {$upload_err_msg} + {/remarksbox} +{/if} + {assign var=area_name value="editwiki"} {if $emited eq 'y'} -<div class="simplebox highlight"> -{tr}The newsletter was sent to {$sent} email addresses{/tr} -<br /><br /> -</div> -{if $errors} -<span class="attention">{tr}Errors detected{/tr}<br /></span> -<table class="normal"> -<tr class="formcolor"><th>{tr}User{/tr}</th><th>{tr}Email{/tr}</th><th>{tr}Message{/tr}</th></tr> -{cycle values="odd,even" print=false} -{section loop=$errors name=ix} -<tr class="formcolor"><td class="{cycle advance=false}">{$errors[ix].user|escape}</td><td class="{cycle advance=false}">{$errors[ix].email|escape}</td><td class="{cycle}">{$errors[ix].msg|escape}</td></tr> -{/section} -</table><br /><br /> + {remarksbox type="note" title="{tr}Notice{/tr}" icon="lock"} + {tr}The newsletter was sent to {$sent} email addresses{/tr} + {/remarksbox} + + {if $errors} + {remarksbox type='warning' title="{tr}Errors{/tr}" icon='error'} + <table class="normal"> + <tr class="formcolor"> + <th>{tr}User{/tr}</th> + <th>{tr}Email{/tr}</th> + <th>{tr}Message{/tr}</th> + </tr> + {cycle values="odd,even" print=false} + {section loop=$errors name=ix} + <tr class="formcolor"> + <td class="{cycle advance=false}">{$errors[ix].user|escape}</td> + <td class="{cycle advance=false}">{$errors[ix].email|escape}</td> + <td class="{cycle}">{$errors[ix].msg|escape}</td> + </tr> + {/section} + </table> + {/remarksbox} + {/if} {/if} -{/if} + {if $presend eq 'y'} -<br /> -<div class="title"> -<h2>{tr}Please Confirm{/tr}</h2> -</div> -<div class="simplebox highlight"> -<b>{tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}</b> -</div> -<p> -<form method="post" action="tiki-send_newsletters.php"> -<input type="hidden" name="nlId" value="{$nlId|escape}" /> -<input type="hidden" name="editionId" value="{$info.editionId}"/> -<input type="hidden" name="subject" value="{$subject|escape}" /> -<input type="hidden" name="data" value="{$data|escape}" /> -<input type="hidden" name="dataparsed" value="{$dataparsed|escape}" /> -<input type="hidden" name="cookietab" value="3" /> -<input type="hidden" name="datatxt" value="{$datatxt|escape}" /> -<input type="submit" name="send" value="{tr}Send{/tr}" /> -<input type="submit" name="preview" value="{tr}Cancel{/tr}" /> -{foreach from=$info.files item=newsletterfile key=fileid} - <input type='hidden' name='newsletterfile[{$fileid}]' value='{$newsletterfile.id}'/> -{/foreach} -</form> -</p> -<div class="title"> -<h2>{tr}Preview{/tr}</h2> -</div> -<h3>{tr}Subject{/tr}</h3> -<div class="simplebox wikitext">{$subject}</div> + {remarksbox type='warning' title="{tr}Please Confirm{/tr}"} + <b>{tr}This newsletter will be sent to {$subscribers} email addresses.{/tr}</b> + {/remarksbox} + <p> + <form method="post" action="tiki-send_newsletters.php"> + <input type="hidden" name="nlId" value="{$nlId|escape}" /> + <input type="hidden" name="editionId" value="{$info.editionId}"/> + <input type="hidden" name="subject" value="{$subject|escape}" /> + <input type="hidden" name="data" value="{$data|escape}" /> + <input type="hidden" name="dataparsed" value="{$dataparsed|escape}" /> + <input type="hidden" name="cookietab" value="3" /> + <input type="hidden" name="datatxt" value="{$datatxt|escape}" /> + <input type="hidden" name="replyto" value="{$replyto|escape}" /> + <input type="submit" name="send" value="{tr}Send{/tr}" /> + <input type="submit" name="preview" value="{tr}Cancel{/tr}" /> + {foreach from=$info.files item=newsletterfile key=fileid} + <input type='hidden' name='newsletterfile[{$fileid}]' value='{$newsletterfile.id}'/> + {/foreach} + </form> + </p> + <h2>{tr}Preview{/tr}</h2> + <h3>{tr}Subject{/tr}</h3> + <div class="simplebox wikitext">{$subject}</div> -<h3>{tr}HTML version{/tr}</h3> -<div class="simplebox wikitext">{$dataparsed}</div> + <h3>{tr}HTML version{/tr}</h3> + <div class="simplebox wikitext">{$dataparsed}</div> -{if $allowTxt eq 'y' } - <h3>{tr}Text version{/tr}</h3> - {if $info.datatxt}<div class="simplebox wikitext" >{$datatxt|escape|nl2br}</div>{/if} - {if $txt}<div class="simplebox wikitext">{$txt|escape|nl2br}</div>{/if} -{/if} -<h3>{tr}Files{/tr}</h3> -<ul> - {foreach from=$info.files item=newsletterfile key=fileid} - <li> - {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) - </li> - {/foreach} -</ul> + {if $allowTxt eq 'y' } + <h3>{tr}Text version{/tr}</h3> + {if $info.datatxt}<div class="simplebox wikitext" >{$datatxt|escape|nl2br}</div>{/if} + {if $txt}<div class="simplebox wikitext">{$txt|escape|nl2br}</div>{/if} + {/if} + + <h3>{tr}Files{/tr}</h3> + <ul> + {foreach from=$info.files item=newsletterfile key=fileid} + <li> + {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) + </li> + {/foreach} + </ul> + {if !empty($replyto)} + <h3>{tr}Reply to{/tr}</h3> + {$replyto|escape} + {/if} {else} -{if $preview eq 'y'} -<div class="title"> -<h2>{tr}Preview{/tr}</h2> -</div> -<h3>{tr}Subject{/tr}</h3> -<div class="simplebox wikitext">{$info.subject}</div> + {if $preview eq 'y'} + <h2>{tr}Preview{/tr}</h2> + <h3>{tr}Subject{/tr}</h3> + <div class="simplebox wikitext">{$info.subject}</div> -<h3>{tr}HTML version{/tr}</h3> -<div class="simplebox wikitext">{$info.dataparsed}</div> + <h3>{tr}HTML version{/tr}</h3> + <div class="simplebox wikitext">{$info.dataparsed}</div> -{if $allowTxt eq 'y' } - <h3>{tr}Text version{/tr}</h3> - {if $info.datatxt}<div class="simplebox wikitext" >{$info.datatxt|escape|nl2br}</div>{/if} - {if $txt}<div class="simplebox wikitext">{$txt|escape|nl2br}</div>{/if} -{/if} + {if $allowTxt eq 'y' } + <h3>{tr}Text version{/tr}</h3> + {if $info.datatxt}<div class="simplebox wikitext" >{$info.datatxt|escape|nl2br}</div>{/if} + {if $txt}<div class="simplebox wikitext">{$txt|escape|nl2br}</div>{/if} + {/if} -<h3>{tr}Files{/tr}</h3> -<ul> - {foreach from=$info.files item=newsletterfile key=fileid} - <li> - {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) - </li> - {/foreach} -</ul> + <h3>{tr}Files{/tr}</h3> + <ul> + {foreach from=$info.files item=newsletterfile key=fileid} + <li> + {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) + </li> + {/foreach} + </ul> + {if !empty($replyto)} + <h3>{tr}Reply to{/tr}</h3> + {$replyto|escape} + {/if} + {/if} -{/if} +{tabset name='tabs_send_newsletters'} -<br /> -{* --- tab headers --- *} -{if $prefs.feature_tabs eq 'y'} -{cycle name=tabs values="1,2,3,4" print=false advance=false reset=true} -<div class="tabs"> -<span id="tab{cycle name=tabs advance=false}" class="tabmark"><a href="javascript:tikitabs({cycle name=tabs},4);">{tr}Edit{/tr}</a></span> -<span id="tab{cycle name=tabs advance=false}" class="tabmark"><a href="javascript:tikitabs({cycle name=tabs},4);">{tr}Drafts{/tr} ({$cant_drafts})</a></span> -<span id="tab{cycle name=tabs advance=false}" class="tabmark"><a href="javascript:tikitabs({cycle name=tabs},4);">{tr}Sent editions{/tr} ({$cant_editions})</a></span> -</div> -{/if} + {tab name='{tr}Edit{/tr}'} + {* --- tab with editor --- *} + <h2>{tr}Prepare a newsletter to be sent{/tr}</h2> + <form action="tiki-send_newsletters.php" method="post" id='editpageform' enctype='multipart/form-data'> + <input type="hidden" name="editionId" value="{$info.editionId}"/> + <table class="normal" id="newstable"> + <tr class="formcolor"> + <td class="formcolor">{tr}Subject{/tr}:</td> + <td class="formcolor"> + <input type="text" maxlength="250" size="80" name="subject" value="{$info.subject|escape}" /> + </td> + </tr> + <tr class="formcolor"> + <td class="formcolor">{tr}Newsletter{/tr}:</td> + <td class="formcolor"> + <select name="nlId" onchange="checkNewsletterTxtArea();"> + {section loop=$newsletters name=ix} + <option value="{$newsletters[ix].nlId|escape}" {if $newsletters[ix].nlId eq $nlId}selected="selected"{/if}> + {$newsletters[ix].name} + </option> + {/section} + </select> + </td> + </tr> -{cycle name=content values="1,2,3,4" print=false advance=false reset=true} -{* --- tab with editor --- *} -<div id="content{cycle name=content assign=focustab}{$focustab}" class="tabcontent"{if $prefs.feature_tabs eq 'y'} style="display:{if $focustab eq $cookietab}block{else}none{/if};"{/if}> + {if $tiki_p_use_content_templates eq 'y'} + <tr class="formcolor"> + <td class="formcolor">{tr}Apply content template{/tr}</td> + <td class="formcolor"> + <input type="hidden" name="previousTemplateId" value="{$templateId}" /> + <select name="templateId" onchange="javascript:document.getElementById('editpageform').submit();"> + <option value="0">{tr}none{/tr}</option> + {section name=ix loop=$templates} + <option value="{$templates[ix].templateId|escape}" {if $templateId eq $templates[ix].templateId}selected="selected"{/if}> + {$templates[ix].name} + </option> + {/section} + </select> + </td> + </tr> + {/if} + + {if $tpls} + <tr class="formcolor"> + <td class="formcolor">{tr}Apply template{/tr}</td> + <td class="formcolor"> + <select name="usedTpl"> + <option value="">{tr}none{/tr}</option> + {section name=ix loop=$tpls} + <option value="{$tpls[ix]|escape}" {if $usedTpl eq $tpls[ix]}selected="selected"{/if}>{$tpls[ix]}</option> + {/section} + </select> + </td> + </tr> + {/if} -<h2>{tr}Prepare a newsletter to be sent{/tr}</h2> -<form action="tiki-send_newsletters.php" method="post" id='editpageform' enctype='multipart/form-data'> -<input type="hidden" name="editionId" value="{$info.editionId}"/> -<table class="normal" id="newstable"> -<tr class="formcolor"><td class="formcolor">{tr}Subject{/tr}:</td><td class="formcolor"><input type="text" maxlength="250" size="80" name="subject" value="{$info.subject|escape}" /></td></tr> -<tr class="formcolor"><td class="formcolor">{tr}Newsletter{/tr}:</td><td class="formcolor"> -<select name="nlId" onchange="checkNewsletterTxtArea();"> -{section loop=$newsletters name=ix} -<option value="{$newsletters[ix].nlId|escape}" {if $newsletters[ix].nlId eq $nlId}selected="selected"{/if}>{$newsletters[ix].name}</option> -{/section} -</select> -</td></tr> + <tr class="formcolor"> + <td class="formcolor"> + {tr}Data HTML{/tr}: + <br /><br /> + {include file='textareasize.tpl' area_name='editwiki' formId='editpageform'} + {if $prefs.quicktags_over_textarea neq 'y'} + <br /><br /> + {include file='tiki-edit_help_tool.tpl' area_name='data'} + {/if} + </td> + <td class="formcolor"> + {if $prefs.quicktags_over_textarea eq 'y'} + {include file='tiki-edit_help_tool.tpl' area_name='data'} + {/if} + <textarea id='editwiki' name="data" rows="{$rows}" cols="{$cols}">{$info.data|escape}</textarea> + <input type="hidden" name="rows" value="{$rows}"/> + <input type="hidden" name="cols" value="{$cols}"/> + <br /> + {tr}Must be wiki parsed{/tr}: <input type="checkbox" name="wikiparse" {if empty($info.wikiparse) or $info.wikiparse eq 'y'} checked="checked"{/if} /> + </td> + </tr> -{if $tiki_p_use_content_templates eq 'y'} -<tr class="formcolor"><td class="formcolor">{tr}Apply content template{/tr}</td><td class="formcolor"> -<input type="hidden" name="previousTemplateId" value="{$templateId}" /> -<select name="templateId" onchange="javascript:document.getElementById('editpageform').submit();"> -<option value="0">{tr}none{/tr}</option> -{section name=ix loop=$templates} -<option value="{$templates[ix].templateId|escape}" {if $templateId eq $templates[ix].templateId}selected="selected"{/if}>{$templates[ix].name}</option> -{/section} -</select> -</td></tr> -{/if} -{if $tpls} -<tr class="formcolor"><td class="formcolor">{tr}Apply template{/tr}</td><td class="formcolor"> -<select name="usedTpl"> -<option value="">{tr}none{/tr}</option> -{section name=ix loop=$tpls} -<option value="{$tpls[ix]|escape}" {if $usedTpl eq $tpls[ix]}selected="selected"{/if}>{$tpls[ix]}</option> -{/section} -</select> -</td></tr> -{/if} + <tr class="formcolor"> + <td class="formcolor" id="txtcol1"> + {tr}Data Txt{/tr}: + <br /><br /> + {include file='textareasize.tpl' area_name='editwikitxt' formId='editpageform'} + </td> + <td class="formcolor" id="txtcol2" > + <textarea id='editwikitxt' name="datatxt" rows="{$rows}" cols="{$cols}">{$info.datatxt|escape}</textarea> + </td> + </tr> -<tr class="formcolor"> - <td class="formcolor">{tr}Data HTML{/tr}: - <br /><br /> - {include file="textareasize.tpl" area_name='editwiki' formId='editpageform'} - {if $prefs.quicktags_over_textarea neq 'y'} - <br /><br /> - {quicktags area_name='data'} - {/if} - </td> - <td class="formcolor"> - {if $prefs.quicktags_over_textarea eq 'y'} - {quicktags area_name='data'} - {/if} - <textarea id='editwiki' name="data" rows="{$rows}" cols="{$cols}">{$info.data|escape}</textarea> - <input type="hidden" name="rows" value="{$rows}"/> - <input type="hidden" name="cols" value="{$cols}"/> - <br />{tr}Must be wiki parsed{/tr}: <input type="checkbox" name="wikiparse" {if empty($info.wikiparse) or $info.wikiparse eq 'y'} checked="checked"{/if} /> - </td> -</tr> - -<tr class="formcolor"> - <td class="formcolor" id="txtcol1"> - {tr}Data Txt{/tr}:<br /><br />{include file="textareasize.tpl" area_name='editwikitxt' formId='editpageform'} - </td> - <td class="formcolor" id="txtcol2" > - <textarea id='editwikitxt' name="datatxt" rows="{$rows}" cols="{$cols}">{$info.datatxt|escape}</textarea> - </td> -</tr> + <tr class="formcolor"> + <td class="formcolor" id="txtcol1"> + {tr}Attached Files{/tr} : + </td> + <td class="formcolor" id="txtcol2" > + <div style='display: none' id='newsletterfileshack'></div> + <div id='newsletterfiles'> + {foreach from=$info.files item=newsletterfile key=fileid} + <div id='newsletterfileid_{$fileid}'> + <a href="javascript:remove_newsletter_file('{$fileid}');">[{tr}remove{/tr}]</a> + {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) + <input type='hidden' name='newsletterfile[{$fileid}]' value='{$newsletterfile.id}'/> + </div> + {/foreach} + </div> + <p><a href="javascript:add_newsletter_file();">{tr}To add a file, click here{/tr}</a></p> + </td> + </tr> - <tr class="formcolor"> - <td class="formcolor" id="txtcol1"> - {tr}Attached Files{/tr} : - </td> - <td class="formcolor" id="txtcol2" > - <div style='display: none' id='newsletterfileshack'></div> - <div id='newsletterfiles'> - {foreach from=$info.files item=newsletterfile key=fileid} - <div id='newsletterfileid_{$fileid}'> - <a href="javascript:remove_newsletter_file('{$fileid}');">[{tr}remove{/tr}]</a> - {$newsletterfile.name|escape} ({$newsletterfile.type|escape}, {$newsletterfile.size|escape} {tr}octets{/tr}) - <input type='hidden' name='newsletterfile[{$fileid}]' value='{$newsletterfile.id}'/> - </div> - {/foreach} - </div> - <p><a href="javascript:add_newsletter_file();">{tr}To add a file, click here{/tr}</a></p> - </td> -</tr> + <tr class="formcolor"> + <td class="formcolor" id="txtcol1">{tr}Reply To Email{/tr}</td> + <td class="formcolor" id="txtcol2" ><input type="text" name="replyto" value="{$replyto|escape}" /> {tr}if not:{/tr} {$prefs.sender_email|escape}</td> + </tr> -<tr class="formcolor"> - <td class="formcolor"> </td> - <td class="formcolor"> - <input type="submit" name="preview" value="{tr}Preview{/tr}" /> <input type="submit" name="save_only" value="{tr}Save as Draft{/tr}" /></td> -</tr> + <tr class="formcolor"> + <td class="formcolor"> </td> + <td class="formcolor"> + <input type="submit" name="preview" value="{tr}Preview{/tr}" /> + + <input type="submit" name="save_only" value="{tr}Save as Draft{/tr}" /> + </td> + </tr> -<tr> - <td class="formcolor"> </td> - <td class="formcolor"> <input type="submit" name="save" value="{tr}Send Newsletters{/tr}" /></td> -</tr> -</table> -</form> -</div> -{* --- tab with drafts --- *} -<div id="content{cycle name=content assign=focustab}{$focustab}" class="tabcontent"{if $prefs.feature_tabs eq 'y'} style="display:{if $focustab eq $cookietab}block{else}none{/if};"{/if}> -{assign var=channels value=$drafts} -{assign var=view_editions value='n'} -{assign var=offset value=$dr_offset} -{assign var=next_offset value=$dr_next_offset} -{assign var=prev_offset value=$dr_prev_offset} -{assign var=actual_page value=$dr_actual_page} -{assign var=cant_pages value=$dr_cant_pages} -{assign var=cur value='dr'} -{assign var=bak value='ed'} -{assign var=sort_mode value=$dr_sort_mode} -{assign var=sort_mode_bak value=$ed_sort_mode} -{assign var=offset value=$dr_offset} -{assign var=offset_bak value=$ed_offset} -{assign var=find value=$dr_find} -{assign var=find_bak value=$ed_find} -{assign var=tab value=2} -<h2>{tr}Drafts{/tr} ({$cant_drafts})</h2> -{include file=sent_newsletters.tpl } -</div> + <tr> + <td class="formcolor"> </td> + <td class="formcolor"> <input type="submit" name="save" value="{tr}Send Newsletter{/tr}" /></td> + </tr> + </table> + </form> + {/tab} -{* --- tab with editions --- *} -<div id="content{cycle name=content assign=focustab}{$focustab}" class="tabcontent"{if $prefs.feature_tabs eq 'y'} style="display:{if $focustab eq $cookietab}block{else}none{/if};"{/if}> -{assign var=channels value=$editions} -{assign var=view_editions value='y'} -{assign var=offset value=$ed_offset} -{assign var=next_offset value=$ed_next_offset} -{assign var=prev_offset value=$ed_prev_offset} -{assign var=actual_page value=$ed_actual_page} -{assign var=cant_pages value=$ed_cant_pages} -{assign var=cur value='ed'} -{assign var=bak value='dr'} -{assign var=sort_mode value=$ed_sort_mode} -{assign var=sort_mode_bak value=$dr_sort_mode} -{assign var=offset value=$ed_offset} -{assign var=offset_bak value=$dr_offset} -{assign var=find value=$ed_find} -{assign var=find_bak value=$dr_find} -{assign var=tab value=3} -<h2>{tr}Sent editions{/tr} ({$cant_editions})</h2> -{include file=sent_newsletters.tpl } -</div> + {tab name="{tr}Drafts{/tr} (`$cant_drafts`)"} + {* --- tab with drafts --- *} + {assign var=channels value=$drafts} + {assign var=view_editions value='n'} + {assign var=offset value=$dr_offset} + {assign var=next_offset value=$dr_next_offset} + {assign var=prev_offset value=$dr_prev_offset} + {assign var=actual_page value=$dr_actual_page} + {assign var=cant_pages value=$dr_cant_pages} + {assign var=cur value='dr'} + {assign var=bak value='ed'} + {assign var=sort_mode value=$dr_sort_mode} + {assign var=sort_mode_bak value=$ed_sort_mode} + {assign var=offset value=$dr_offset} + {assign var=offset_bak value=$ed_offset} + {assign var=find value=$dr_find} + {assign var=find_bak value=$ed_find} + {assign var=tab value=2} + <h2>{tr}Drafts{/tr} ({$cant_drafts})</h2> + {include file='sent_newsletters.tpl' } + {/tab} + + {tab name="{tr}Sent editions{/tr} ($cant_editions)"} + {* --- tab with editions --- *} + {assign var=channels value=$editions} + {assign var=view_editions value='y'} + {assign var=offset value=$ed_offset} + {assign var=next_offset value=$ed_next_offset} + {assign var=prev_offset value=$ed_prev_offset} + {assign var=actual_page value=$ed_actual_page} + {assign var=cant_pages value=$ed_cant_pages} + {assign var=cur value='ed'} + {assign var=bak value='dr'} + {assign var=sort_mode value=$ed_sort_mode} + {assign var=sort_mode_bak value=$dr_sort_mode} + {assign var=offset value=$ed_offset} + {assign var=offset_bak value=$dr_offset} + {assign var=find value=$ed_find} + {assign var=find_bak value=$dr_find} + {assign var=tab value=3} + <h2>{tr}Sent editions{/tr} ({$cant_editions})</h2> + {include file='sent_newsletters.tpl' } + {/tab} + {/tabset} {/if} + <script type='text/javascript'> <!-- {if $allowTxt eq 'n'} Modified: branches/experimental/ui-revamp/tiki-objectpermissions.php =================================================================== --- branches/experimental/ui-revamp/tiki-objectpermissions.php 2009-06-30 13:23:57 UTC (rev 19861) +++ branches/experimental/ui-revamp/tiki-objectpermissions.php 2009-06-30 14:12:52 UTC (rev 19862) @@ -25,6 +25,12 @@ } } else { $tikilib->get_perm_object($_REQUEST['objectId'], $_REQUEST['objectType']); + if ($_REQUEST['objectType'] == 'tracker') { + global $trklib; include('lib/trackers/trackerlib.php'); + if ($groupCreatorFieldId = $trklib->get_field_id_from_type($_REQUEST['objectId'], 'g', '1%')) { + $smarty->assign('group_tracker', 'y'); + } + } } if (!($tiki_p_admin_objects == 'y' || (isset($$perm) && $$perm == 'y') ||(isset($special_perm) && $special_perm == 'y'))) { @@ -205,4 +211,3 @@ } else { $smarty->display("tiki.tpl"); } -?> Modified: branches/experimental/ui-revamp/tiki-send_newsletters.php =================================================================== --- branches/experimental/ui-revamp/tiki-send_newsletters.php 2009-06-30 13:23:57 UTC (rev 19861) +++ branches/experimental/ui-revamp/tiki-send_newsletters.php 2009-06-30 14:12:52 UTC (rev 19862) @@ -209,7 +209,9 @@ } else { $info["dataparsed"] = "<html><body>".(($info['wikiparse'] == 'y')?$tikilib->parse_data($info["data"], array('absolute_links' => true)):$info['data'])."</body></html>"; } - + if (!empty($_REQUEST['replyto'])) { + $smarty->assign('replyto', $_REQUEST['replyto']); + } $smarty->assign('info', $info); } @@ -249,6 +251,9 @@ $cant = count($subscribers); $smarty->assign('subscribers', $cant); $smarty->assign('info', $info); + if (!empty($_REQUEST['replyto'])) { + $smarty->assign('replyto', $_REQUEST['replyto']); + } } $smarty->assign('emited', 'n'); @@ -315,6 +320,9 @@ $userEmail = ''; } $mail->setFrom($sender_email); + if (!empty($_REQUEST['replyto'])) { + $mail->setHeader("Reply-To", $_REQUEST['replyto']); + } $mail->setSubject($_REQUEST["subject"]); // htmlMimeMail memorised the encoded subject $languageEmail = ! $userEmail ? $prefs['site_language'] : $tikilib->get_user_preference($userEmail, "language", $prefs['site_language']); if ($nl_info["unsubMsg"] == 'y') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |