From: <ge...@us...> - 2012-03-30 10:20:06
|
Revision: 40551 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40551&view=rev Author: gezzzan Date: 2012-03-30 10:19:56 +0000 (Fri, 30 Mar 2012) Log Message: ----------- [MOD] article topic, type label and text simplifications, also removing built-in help text from types as help is already provided through link to the corresponding page at doc.tiki.org Modified Paths: -------------- branches/9.x/templates/tiki-admin_topics.tpl branches/9.x/templates/tiki-article_types.tpl branches/9.x/templates/tiki-edit_topic.tpl Modified: branches/9.x/templates/tiki-admin_topics.tpl =================================================================== --- branches/9.x/templates/tiki-admin_topics.tpl 2012-03-30 00:53:08 UTC (rev 40550) +++ branches/9.x/templates/tiki-admin_topics.tpl 2012-03-30 10:19:56 UTC (rev 40551) @@ -1,17 +1,17 @@ {* $Id$ *} -{title admpage="articles" help="Articles"}{tr}Admin Topics{/tr}{/title} +{title admpage="articles" help="Articles"}{tr}Admin Article Topics{/tr}{/title} -<h2>{tr}Create a new topic{/tr}</h2> +<h2>{tr}Add topic{/tr}</h2> <form enctype="multipart/form-data" action="tiki-admin_topics.php" method="post"> <table class="formcolor"> <tr> - <td>{tr}Topic Name{/tr}</td> + <td>{tr}Name{/tr}</td> <td><input type="text" name="name" /></td> </tr> <tr> - <td>{tr}Upload Image{/tr}</td> + <td>{tr}Image{/tr}</td> <td> <input type="hidden" name="MAX_FILE_SIZE" value="1000000" /> <input name="userfile1" type="file" /> @@ -26,7 +26,7 @@ </table> </form> -<h2>{tr}List of topics{/tr}</h2> +<h2>{tr}Topics{/tr}</h2> <table class="normal"> <tr> <th>{tr}ID{/tr}</th> @@ -35,7 +35,7 @@ <th>{tr}Active{/tr}</th> <th>{tr}Articles{/tr}</th> {if $prefs.feature_submissions eq 'y'}<th>{tr}Submissions{/tr}</th>{/if} - <th>{tr}Action{/tr}</th> + <th>{tr}Actions{/tr}</th> </tr> {cycle print=false values="even,odd"} {section name=user loop=$topics} Modified: branches/9.x/templates/tiki-article_types.tpl =================================================================== --- branches/9.x/templates/tiki-article_types.tpl 2012-03-30 00:53:08 UTC (rev 40550) +++ branches/9.x/templates/tiki-article_types.tpl 2012-03-30 10:19:56 UTC (rev 40551) @@ -1,49 +1,21 @@ {* $Id$ *} {title admpage="articles" url="tiki-article_types.php" help=Articles}{tr}Admin Article Types{/tr}{/title} -<div class="navbar"> - {button _onclick="javascript:toggle('wiki-edithelp');return false;" _text="{tr}Show Help{/tr}" _ajax="n"} -</div> - - -<div class="wiki-edithelp" id="wiki-edithelp" style="display:none;"> - <b>{tr}Article type{/tr}</b> - {tr}Shows up in the drop down list of article types{/tr}<br /> - <b>{tr}Author Rating{/tr}</b> - {tr}Allow ratings by the author{/tr}<br /> - <b>{tr}Show before publish date{/tr}</b> - {tr}non-admins can view before the publish date{/tr}<br /> - <b>{tr}Show after expire date{/tr}</b> - {tr}non-admins can view after the expire date{/tr}<br /> - <b>{tr}Heading only{/tr}</b> - {tr}No article body, heading only{/tr}<br /> - <b>{tr}Comments{/tr}</b> - {tr}Allow comments for this type{/tr}<br /> - <b>{tr}Comment Can Rate Article{/tr}</b> - {tr}Allow comments to include a rating value{/tr}<br /> - <b>{tr}Show image{/tr}</b> - {tr}Show topic or own image{/tr}<br /> - <b>{tr}Show avatar{/tr}</b> - {tr}Show author's avatar{/tr}<br /> - <b>{tr}Show author{/tr}</b> - {tr}Show author name{/tr}<br /> - <b>{tr}Show publish date{/tr}</b> - {tr}Show publish date{/tr}<br /> - <b>{tr}Show expire date{/tr}</b> - {tr}Show expire date{/tr}<br /> - <b>{tr}Show reads{/tr}</b> - {tr}Show the number of times the article was read{/tr}<br /> - <b>{tr}Show size{/tr}</b> - {tr}Show the size of the article{/tr}<br /> - <b>{tr}Show topline{/tr}</b> - {tr}Show a small title over the title{/tr}<br /> - <b>{tr}Show subtitle{/tr}</b> - {tr}Show the subtitle{/tr}<br /> - <b>{tr}Show source{/tr}</b> - {tr}Show link to source after article body{/tr}<br /> - <b>{tr}Show Image Caption{/tr}</b> - {tr}Show a legend under the image{/tr}<br /> - <b>{tr}Creator can edit{/tr}</b> - {tr}The person who submits an article of this type can edit it{/tr}<br /> - <b>{tr}Action{/tr}</b> - {tr}Actions on this article type{/tr}<br /> -</div> - {tabset name='tabs_articletypes'} - {tab name="{tr}List of article types{/tr}"} + {tab name="{tr}Article Types{/tr}"} <form enctype="multipart/form-data" action="tiki-article_types.php" method="post"> {section name=user loop=$types} <h3>{tr}{$types[user].type|escape}{/tr}</h3> - <a class="link" href="tiki-view_articles.php?type={$types[user].type|escape:url}">{tr}view articles with this type{/tr}</a> + <a class="link" href="tiki-view_articles.php?type={$types[user].type|escape:url}">{tr}View articles with this type{/tr}</a> <table class="normal"> <tr> <th>{tr}Articles{/tr}</th> - <th>{tr}Author Rating{/tr}</th> + <th>{tr}Author rating{/tr}</th> <th>{tr}Show before publish date{/tr}</th> <th>{tr}Show after expire date{/tr}</th> <th>{tr}Heading only{/tr}</th> <th>{tr}Comments{/tr}</th> - <th>{tr}Comment Can Rate Article{/tr}</th> + <th>{tr}Comment can rate article{/tr}</th> <th>{tr}Show image{/tr}</th> <th>{tr}Show avatar{/tr}</th> <th>{tr}Show author{/tr}</th> @@ -91,7 +63,7 @@ <th>{tr}Show topline{/tr}</th> <th>{tr}Show subtitle{/tr}</th> <th>{tr}Show source{/tr}</th> - <th>{tr}Show Image Caption{/tr}</th> + <th>{tr}Show image caption{/tr}</th> <th>{tr}Creator can edit{/tr}</th> <th colspan="2">{tr}Action{/tr}</th> </tr> @@ -159,9 +131,9 @@ <br /> {/section} {/tab} - {tab name="{tr}Create a new type{/tr}"} - <h3>{tr}Create a new type{/tr}</h3> - <input type="text" name="new_type" /><input type="submit" name="add_type" value="{tr}Create a new type{/tr}" /> + {tab name="{tr}Add Type{/tr}"} + <h3>{tr}Add article type{/tr}</h3> + <input type="text" name="new_type" /><input type="submit" name="add_type" value="{tr}Add{/tr}" /> {/tab} </form> {/tabset} Modified: branches/9.x/templates/tiki-edit_topic.tpl =================================================================== --- branches/9.x/templates/tiki-edit_topic.tpl 2012-03-30 00:53:08 UTC (rev 40550) +++ branches/9.x/templates/tiki-edit_topic.tpl 2012-03-30 10:19:56 UTC (rev 40551) @@ -1,8 +1,8 @@ {* $Id$ *} -{title help="Articles"}{tr}Admin Topics{/tr}{/title} +{title help="Articles"}{tr}Admin Article Topics{/tr}{/title} -<h2>{tr}Edit a topic{/tr}</h2> +<h2>{tr}Edit topic{/tr}</h2> {if !empty($errors)} <div class="highlight simplebox">{section name=ix loop=$errors}{$errors[ix]}{/section}</div> @@ -10,19 +10,19 @@ <form enctype="multipart/form-data" action="tiki-edit_topic.php" method="post"> <table class="formcolor"> -<tr><td>{tr}Topic Name{/tr}</td> +<tr><td>{tr}Name{/tr}</td> <td> <input type="hidden" name="topicid" value="{$topic_info.topicId}" /> <input type="text" name="name" value="{$topic_info.name|escape}" /> </td> </tr> -<tr><td>{tr}Upload Image{/tr}</td> +<tr><td>{tr}Image{/tr}</td> <td> <input type="hidden" name="MAX_FILE_SIZE" value="1000000" /> <input name="userfile1" type="file" /> </td> </tr> -<tr><td>{tr}Add Notification Email{/tr}</td><td><input type="text" name="email" value="{$email|escape}" /> <a href="tiki-admin_notifications.php" title="{tr}Admin notifications{/tr}">{icon _id='wrench' alt="{tr}Admin notifications{/tr}"}</a></td></tr> +<tr><td>{tr}Notification Email{/tr}</td><td><input type="text" name="email" value="{$email|escape}" /> <a href="tiki-admin_notifications.php" title="{tr}Admin notifications{/tr}">{icon _id='wrench' alt="{tr}Admin notifications{/tr}"}</a></td></tr> <tr><td> </td><td><input type="submit" name="edittopic" value="{tr}Edit{/tr}" /></td></tr> </table> </form> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-05 17:15:31
|
Revision: 40765 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40765&view=rev Author: jonnybradley Date: 2012-04-05 17:15:24 +0000 (Thu, 05 Apr 2012) Log Message: ----------- [FIX] login: Correct js added in r40696 to workproperly with multiple login boxes present. Also split jq ready and notonready blocks and set module_logo_instance var when used in tiki-login pages Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40696&view=rev Modified Paths: -------------- branches/9.x/templates/modules/mod-login_box.tpl branches/9.x/templates/tiki-login.tpl Modified: branches/9.x/templates/modules/mod-login_box.tpl =================================================================== --- branches/9.x/templates/modules/mod-login_box.tpl 2012-04-05 17:11:43 UTC (rev 40764) +++ branches/9.x/templates/modules/mod-login_box.tpl 2012-04-05 17:15:24 UTC (rev 40765) @@ -9,7 +9,8 @@ $('.divCapson', $(el).parents('div:first')).hide(); } } - +{/jq} +{jq} //We were having problems with the menu disapearing when you selected an input, this prevents the menu from going away once you have put focus on an input var hasFocus = false; var loginPopup = $('.siteloginbar_popup .cssmenu_horiz') @@ -26,8 +27,9 @@ .blur(function() { hasFocus = false; }); - -$("form[name=loginbox]").submit( function () { +{/jq} +{jq} +$("#loginbox-{{$module_logo_instance}}").submit( function () { if ($("#login-user_{{$module_logo_instance}}").val() && $("#login-pass_{{$module_logo_instance}}").val()) { return true; } else { @@ -102,7 +104,7 @@ {/if} {else} {assign var='close_tags' value=''} - <form name="loginbox" action="{if $prefs.https_login eq 'encouraged' || $prefs.https_login eq 'required' || $prefs.https_login eq 'force_nocheck'}{$base_url_https}{/if}{$prefs.login_url}" + <form name="loginbox" id="loginbox-{$module_logo_instance}" action="{if $prefs.https_login eq 'encouraged' || $prefs.https_login eq 'required' || $prefs.https_login eq 'force_nocheck'}{$base_url_https}{/if}{$prefs.login_url}" method="post" {if $prefs.feature_challenge eq 'y'}onsubmit="doChallengeResponse()"{/if} {if $prefs.desactive_login_autocomplete eq 'y'} autocomplete="off"{/if}> {if $prefs.feature_challenge eq 'y'} Modified: branches/9.x/templates/tiki-login.tpl =================================================================== --- branches/9.x/templates/tiki-login.tpl 2012-04-05 17:11:43 UTC (rev 40764) +++ branches/9.x/templates/tiki-login.tpl 2012-04-05 17:15:24 UTC (rev 40765) @@ -1,3 +1,3 @@ <div align="center"> -{include file='modules/mod-login_box.tpl'} +{include file='modules/mod-login_box.tpl' module_logo_instance='tiki-login'} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2012-04-07 20:27:39
|
Revision: 40823 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40823&view=rev Author: sylvieg Date: 2012-04-07 20:27:32 +0000 (Sat, 07 Apr 2012) Log Message: ----------- [merge/r40822][ENH]find: add an help to say where it is find Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40822&view=rev Modified Paths: -------------- branches/9.x/templates/find.tpl branches/9.x/templates/tiki-browse_categories.tpl branches/9.x/templates/tiki-list_file_gallery.tpl branches/9.x/templates/tiki-listpages.tpl Modified: branches/9.x/templates/find.tpl =================================================================== --- branches/9.x/templates/find.tpl 2012-04-07 20:26:14 UTC (rev 40822) +++ branches/9.x/templates/find.tpl 2012-04-07 20:27:32 UTC (rev 40823) @@ -25,6 +25,7 @@ * filter_values : array( filter_fieldX => filter_fieldX_selected_value, ... ) * autocomplete : name of the variable you want for autocomplete of the input field (only for <input type="text" ... /> * find_other : If value != '', show an input box label with find_other + * find_in : popup to eplain on what is the find * * Usage examples : {include file='find.tpl'} * {include file='find.tpl' find_show_languages='y' find_show_categories='y' find_show_num_rows='y'} @@ -47,6 +48,7 @@ {jq}$("#find").tiki("autocomplete", "{{$autocomplete}}"){/jq} {/if} </label> + {if $find_in}{help url="#" desc="{tr}Find in:{/tr} {$find_in}"}{/if} {if isset($exact_match)} <label class="findexactmatch" for="findexactmatch" style="white-space: nowrap"> Modified: branches/9.x/templates/tiki-browse_categories.tpl =================================================================== --- branches/9.x/templates/tiki-browse_categories.tpl 2012-04-07 20:26:14 UTC (rev 40822) +++ branches/9.x/templates/tiki-browse_categories.tpl 2012-04-07 20:27:32 UTC (rev 40823) @@ -109,7 +109,9 @@ </div> <form method="post" action="tiki-browse_categories.php"> - <label>{tr}Find:{/tr} {if $parentId ne 0}{$p_info.name|escape} {/if}<input type="text" name="find" value="{$find|escape}" size="35" /></label><input type="submit" value="{tr}Find{/tr}" name="search" /> + <label>{tr}Find:{/tr} {if $parentId ne 0}{$p_info.name|escape} {/if}<input type="text" name="find" value="{$find|escape}" size="35" /></label> + {help url="#" desc="{tr}Find in:{/tr} <ul><li>{tr}Name{/tr}</li><li>{tr}Description{/tr}</li></ul>"} + <input type="submit" value="{tr}Find{/tr}" name="search" /> <label>{tr}in the current category - and its subcategories: {/tr}<input type="checkbox" name="deep" {if $deep eq 'on'}checked="checked"{/if}/></label> <input type="hidden" name="parentId" value="{$parentId|escape}" /> <input type="hidden" name="type" value="{$type|escape}" /> Modified: branches/9.x/templates/tiki-list_file_gallery.tpl =================================================================== --- branches/9.x/templates/tiki-list_file_gallery.tpl 2012-04-07 20:26:14 UTC (rev 40822) +++ branches/9.x/templates/tiki-list_file_gallery.tpl 2012-04-07 20:27:32 UTC (rev 40823) @@ -173,7 +173,7 @@ {include file='duplicate_file_gallery.tpl'} {else} {if $prefs.fgal_search eq 'y'} - {include file='find.tpl' find_show_num_rows = 'y' find_show_categories_multi='y' find_durations=$find_durations find_show_sub='y' find_other="{tr}Gallery of this fileId{/tr}"} + {include file='find.tpl' find_show_num_rows = 'y' find_show_categories_multi='y' find_durations=$find_durations find_show_sub='y' find_other="{tr}Gallery of this fileId{/tr}" find_in="<ul><li>{tr}Name{/tr}</li><li>{tr}Filename{/tr}</li><li>{tr}Description{/tr}</li></ul>"} {/if} {if $prefs.fgal_search_in_content eq 'y' and $galleryId > 0} <div class="findtable"> Modified: branches/9.x/templates/tiki-listpages.tpl =================================================================== --- branches/9.x/templates/tiki-listpages.tpl 2012-04-07 20:26:14 UTC (rev 40822) +++ branches/9.x/templates/tiki-listpages.tpl 2012-04-07 20:27:32 UTC (rev 40823) @@ -6,7 +6,7 @@ {tabset name='tabs_wikipages'} {tab name="{tr}List Wiki Pages{/tr}"} - {include file='find.tpl' find_show_languages='y' find_show_languages_excluded='y' find_show_categories_multi='y' find_show_num_rows='y'} + {include file='find.tpl' find_show_languages='y' find_show_languages_excluded='y' find_show_categories_multi='y' find_show_num_rows='y' find_in="<ul><li>{tr}Page name{/tr}</li></ul>" } <form name="checkform" method="get" action="{$smarty.server.PHP_SELF}"> <input type="hidden" name="offset" value="{$offset|escape}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2012-04-30 02:26:00
|
Revision: 41203 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41203&view=rev Author: lindonb Date: 2012-04-30 02:25:54 +0000 (Mon, 30 Apr 2012) Log Message: ----------- Add find_in information for tiki-admin_calendars find call and check if variable set in find.tpl Modified Paths: -------------- branches/9.x/templates/find.tpl branches/9.x/templates/tiki-admin_calendars.tpl Modified: branches/9.x/templates/find.tpl =================================================================== --- branches/9.x/templates/find.tpl 2012-04-30 01:05:35 UTC (rev 41202) +++ branches/9.x/templates/find.tpl 2012-04-30 02:25:54 UTC (rev 41203) @@ -48,7 +48,7 @@ {jq}$("#find").tiki("autocomplete", "{{$autocomplete}}"){/jq} {/if} </label> - {if $find_in}{help url="#" desc="{tr}Find in:{/tr} {$find_in}"}{/if} + {if isset($find_in)}{help url="#" desc="{tr}Find in:{/tr} {$find_in}"}{/if} {if isset($exact_match)} <label class="findexactmatch" for="findexactmatch" style="white-space: nowrap"> Modified: branches/9.x/templates/tiki-admin_calendars.tpl =================================================================== --- branches/9.x/templates/tiki-admin_calendars.tpl 2012-04-30 01:05:35 UTC (rev 41202) +++ branches/9.x/templates/tiki-admin_calendars.tpl 2012-04-30 02:25:54 UTC (rev 41203) @@ -18,7 +18,7 @@ {tab name="{tr}List of Calendars{/tr}"} <h2>{tr}List of Calendars{/tr}</h2> - {include file='find.tpl'} + {include file='find.tpl' find_in="<ul><li>{tr}Calendar name{/tr}</li></ul>"} <table class="normal"> <tr> <th> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xa...@us...> - 2012-05-04 18:39:37
|
Revision: 41339 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41339&view=rev Author: xavidp Date: 2012-05-04 18:39:31 +0000 (Fri, 04 May 2012) Log Message: ----------- [FIX]i18n added to strings and info on time units (minutes) added (missleading otherwise) Modified Paths: -------------- branches/9.x/templates/tiki-timesheet.tpl branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl Modified: branches/9.x/templates/tiki-timesheet.tpl =================================================================== --- branches/9.x/templates/tiki-timesheet.tpl 2012-05-04 18:28:51 UTC (rev 41338) +++ branches/9.x/templates/tiki-timesheet.tpl 2012-05-04 18:39:31 UTC (rev 41339) @@ -14,8 +14,8 @@ <div id="tab1"> <div id="jtrack-holder" style="margin: 0px;"> <div id="jtrack-bar"> - <a href="#" class="jtrack-create">New task</a> | - <a href="#" class="jtrack-remove-all">Delete all</a> | + <a href="#" class="jtrack-create">{tr}New task{/tr}</a> | + <a href="#" class="jtrack-remove-all">{tr}Delete all{/tr}</a> | <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="Toggle completed" /> C <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="Toggle archived" /> A </div> @@ -23,54 +23,54 @@ <div id="jtrack-form-list" class="jtrack-form"></div> <div id="jtrack-form-create" class="jtrack-form" style="display: none"> <p> - <label for="jtrack-task-name">Task name</label> + <label for="jtrack-task-name">{tr}Task name{/tr}</label> <input type="text" name="jtrack-task-name" id="jtrack-task-name" class="jtrack-text" /> </p> <p> - <label for="jtrack-task-estimate">Estimate</label> + <label for="jtrack-task-estimate">{tr}Estimate (in min.){/tr}</label> <input type="text" name="jtrack-task-estimate" id="jtrack-task-estimate" class="jtrack-text" /> </p> <p> - <input type="button" id="jtrack-button-create" value="Save" /> + <input type="button" id="jtrack-button-create" value="{tr}Save{/tr}" /> <a href="#" class="jtrack-cancel" rel="jtrack-form-create">Cancel</a> </p> <p style="display: none" id="jtrack-create-status"></p> </div> <div id="jtrack-form-update" class="jtrack-form" style="display: none"> <p> - <label for="jtrack-task-name">Task name</label> + <label for="jtrack-task-name">{tr}Task name{/tr}</label> <input type="text" name="jtrack-task-name" id="jtrack-task-name" class="jtrack-text" /> </p> <p> - <label for="jtrack-task-estimate">Estimate</label> + <label for="jtrack-task-estimate">{tr}Estimate{/tr}</label> <input type="text" name="jtrack-task-estimate" id="jtrack-task-estimate" class="jtrack-text" /> </p> <p> - <input type="checkbox" name="jtrack-task-completed" id="jtrack-task-completed" /> Task is completed<br /> - <input type="checkbox" name="jtrack-task-archived" id="jtrack-task-archived" /> Task is archived + <input type="checkbox" name="jtrack-task-completed" id="jtrack-task-completed" /> {tr}Task is completed{/tr}<br /> + <input type="checkbox" name="jtrack-task-archived" id="jtrack-task-archived" /> {tr}Task is archived{/tr} </p> <p> - <label>Created at</label> + <label>{tr}Created at{/tr}</label> <span id="created"></span> </p> <p> - <input type="button" id="jtrack-button-update" value="Update" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-update">Cancel</a> + <input type="button" id="jtrack-button-update" value="{tr}Update{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-update">{tr}Cancel{/tr}</a> </p> <p style="display: none" id="jtrack-update-status"></p> </div> <div id="jtrack-form-remove" class="jtrack-form" style="display: none"> <p id="jtrack-remove-confirm"></p> <p> - <input type="button" id="jtrack-button-remove" value="Delete" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-remove">Cancel</a> + <input type="button" id="jtrack-button-remove" value="{tr}Delete{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-remove">{tr}Cancel{/tr}</a> </p> </div> <div id="jtrack-form-remove-all" class="jtrack-form" style="display: none"> - <p>Are you sure you want to delete all tasks?</p> + <p>{tr}Are you sure you want to delete all tasks?{/tr}</p> <p> - <input type="button" id="jtrack-button-remove-all" value="Delete all" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-remove-all">Cancel</a> + <input type="button" id="jtrack-button-remove-all" value="{tr}Delete all{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-remove-all">{tr}Cancel{/tr}</a> </p> </div> </div> Modified: branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl =================================================================== --- branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl 2012-05-04 18:28:51 UTC (rev 41338) +++ branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl 2012-05-04 18:39:31 UTC (rev 41339) @@ -3,8 +3,8 @@ <div class="ui-widget-header ui-corner-top">{tr}Mini TimeSheet{/tr} {button href="tiki-timesheet.php" _text="{tr}Full View{/tr}"}</div> <div id="jtrack-holder" style="margin: 5px;text-align: left;"> <div id="jtrack-bar"> - <a href="#" class="jtrack-create">New task</a> | - <a href="#" class="jtrack-remove-all">Delete all</a> | + <a href="#" class="jtrack-create">{tr}New task{/tr}</a> | + <a href="#" class="jtrack-remove-all">{tr}Delete all{/tr}</a> | <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="Toggle completed" /> C <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="Toggle archived" /> A </div> @@ -12,54 +12,54 @@ <div id="jtrack-form-list" class="jtrack-form"></div> <div id="jtrack-form-create" class="jtrack-form" style="display: none"> <p> - <label for="jtrack-task-name">Task name</label> + <label for="jtrack-task-name">{tr}Task name{/tr}</label> <input type="text" name="jtrack-task-name" id="jtrack-task-name" class="jtrack-text" /> </p> <p> - <label for="jtrack-task-estimate">Estimate</label> + <label for="jtrack-task-estimate">{tr}Estimate (in min.){/tr}</label> <input type="text" name="jtrack-task-estimate" id="jtrack-task-estimate" class="jtrack-text" /> </p> <p> - <input type="button" id="jtrack-button-create" value="Save" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-create">Cancel</a> + <input type="button" id="jtrack-button-create" value="{tr}Save{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-create">{tr}Cancel{/tr}</a> </p> <p style="display: none" id="jtrack-create-status"></p> </div> <div id="jtrack-form-update" class="jtrack-form" style="display: none"> <p> - <label for="jtrack-task-name">Task name</label> + <label for="jtrack-task-name">{tr}Task name{/tr}</label> <input type="text" name="jtrack-task-name" id="jtrack-task-name" class="jtrack-text" /> </p> <p> - <label for="jtrack-task-estimate">Estimate</label> + <label for="jtrack-task-estimate">{tr}Estimate (in min.){/tr}</label> <input type="text" name="jtrack-task-estimate" id="jtrack-task-estimate" class="jtrack-text" /> </p> <p> - <input type="checkbox" name="jtrack-task-completed" id="jtrack-task-completed" /> Task is completed<br /> - <input type="checkbox" name="jtrack-task-archived" id="jtrack-task-archived" /> Task is archived + <input type="checkbox" name="jtrack-task-completed" id="jtrack-task-completed" /> {tr}Task is completed{/tr}<br /> + <input type="checkbox" name="jtrack-task-archived" id="jtrack-task-archived" /> {tr}Task is archived{/tr} </p> <p> - <label>Created at</label> + <label>{tr}Created at{/tr}</label> <span id="created"></span> </p> <p> - <input type="button" id="jtrack-button-update" value="Update" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-update">Cancel</a> + <input type="button" id="jtrack-button-update" value="{tr}Update{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-update">{tr}Cancel{/tr}</a> </p> <p style="display: none" id="jtrack-update-status"></p> </div> <div id="jtrack-form-remove" class="jtrack-form" style="display: none"> <p id="jtrack-remove-confirm"></p> <p> - <input type="button" id="jtrack-button-remove" value="Delete" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-remove">Cancel</a> + <input type="button" id="jtrack-button-remove" value="{tr}Delete{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-remove">{tr}Cancel{/tr}</a> </p> </div> <div id="jtrack-form-remove-all" class="jtrack-form" style="display: none"> - <p>Are you sure you want to delete all tasks?</p> + <p>{tr}Are you sure you want to delete all tasks?{/tr}</p> <p> - <input type="button" id="jtrack-button-remove-all" value="Delete all" /> - <a href="#" class="jtrack-cancel" rel="jtrack-form-remove-all">Cancel</a> + <input type="button" id="jtrack-button-remove-all" value="{tr}Delete all{/tr}" /> + <a href="#" class="jtrack-cancel" rel="jtrack-form-remove-all">{tr}Cancel{/tr}</a> </p> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-05-07 13:19:49
|
Revision: 41375 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41375&view=rev Author: jonnybradley Date: 2012-05-07 13:19:42 +0000 (Mon, 07 May 2012) Log Message: ----------- [FIX] search: Revert r41374 and do it properly (hide containing fieldset when for negative preffilters) Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41374&view=rev Modified Paths: -------------- branches/9.x/templates/admin/include_search.tpl branches/9.x/templates/tiki-admin.tpl Modified: branches/9.x/templates/admin/include_search.tpl =================================================================== --- branches/9.x/templates/admin/include_search.tpl 2012-05-07 12:45:30 UTC (rev 41374) +++ branches/9.x/templates/admin/include_search.tpl 2012-05-07 13:19:42 UTC (rev 41375) @@ -112,10 +112,6 @@ {preference name=feature_search_show_forbidden_cat} </div> </fieldset> - {jq}if ($('.feature_search_fulltext:first').css('display') !== 'block') { - $('.feature_search_fulltext:first').parents('fieldset:first').hide(); -}{/jq}{* hide mysql search entirely when not supported *} - <fieldset> <legend>{tr}Features{/tr}</legend> {preference name=search_autocomplete} Modified: branches/9.x/templates/tiki-admin.tpl =================================================================== --- branches/9.x/templates/tiki-admin.tpl 2012-05-07 12:45:30 UTC (rev 41374) +++ branches/9.x/templates/tiki-admin.tpl 2012-05-07 13:19:42 UTC (rev 41375) @@ -35,6 +35,10 @@ selector.parents('fieldset:not(.tabcontent)').show(); selector.closest('fieldset.tabcontent').addClass('filled'); }; + var hide = function (selector) { + selector.hide(); + selector.parents('fieldset:not(.tabcontent)').hide(); + }; var filters = []; var prefs = $('.adminoptionbox.preference').hide(); @@ -46,7 +50,7 @@ filters.push($(this).val()); show(targets); } else if ($(this).is('.negative:not(:checked)')) { - targets.hide(); + hide(targets); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-05-07 13:39:52
|
Revision: 41379 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41379&view=rev Author: jonnybradley Date: 2012-05-07 13:39:45 +0000 (Mon, 07 May 2012) Log Message: ----------- [MOD] admin: hide disabled admin sections if not showing advanced (all part of "Simpler config on fresh install") Modified Paths: -------------- branches/9.x/templates/admin/include_list_sections.tpl branches/9.x/templates/tiki-admin.tpl Modified: branches/9.x/templates/admin/include_list_sections.tpl =================================================================== --- branches/9.x/templates/admin/include_list_sections.tpl 2012-05-07 13:29:29 UTC (rev 41378) +++ branches/9.x/templates/admin/include_list_sections.tpl 2012-05-07 13:39:45 UTC (rev 41379) @@ -13,9 +13,9 @@ {foreach from=$icons key=page item=info} {if $info.position} {if $info.disabled} - {assign var=class value="admbox off"} + {assign var=class value="admbox off advanced"} {else} - {assign var=class value="admbox"} + {assign var=class value="admbox basic"} {/if} {self_link page=$page _class=$class _style="background-image: url('img/icons/sprite/admin.fullpanel.png'); background-position: `$info.position`" _title=$info.title} <img src="img/trans.png" alt="{$info.title|escape}" title="{$info.title|escape}{if $info.disabled} ({tr}Disabled{/tr}){/if}" /> Modified: branches/9.x/templates/tiki-admin.tpl =================================================================== --- branches/9.x/templates/tiki-admin.tpl 2012-05-07 13:29:29 UTC (rev 41378) +++ branches/9.x/templates/tiki-admin.tpl 2012-05-07 13:39:45 UTC (rev 41379) @@ -41,11 +41,11 @@ }; var filters = []; - var prefs = $('.adminoptionbox.preference').hide(); + var prefs = $('.adminoptionbox.preference, .admbox').hide(); prefs.parents('fieldset:not(.tabcontent)').hide(); prefs.closest('fieldset.tabcontent').removeClass('filled'); $('.preffilter').each(function () { - var targets = $('.adminoptionbox.preference.' + $(this).val()); + var targets = $('.adminoptionbox.preference.' + $(this).val() + ',.admbox.' + $(this).val()); if ($(this).is(':checked')) { filters.push($(this).val()); show(targets); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nk...@us...> - 2012-05-10 04:38:20
|
Revision: 41405 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41405&view=rev Author: nkoth Date: 2012-05-10 04:38:13 +0000 (Thu, 10 May 2012) Log Message: ----------- [FIX] Since section is only for sequentially indexed arrays, and since categories have been refactored to have the key as the categId, it is now associative and so once categories are deleted the listing will have missing cats when using section Modified Paths: -------------- branches/9.x/templates/tiki-edit_structure.tpl branches/9.x/templates/tiki-search_replace.tpl branches/9.x/templates/tiki-searchresults.tpl branches/9.x/templates/tiki-theme_control.tpl Modified: branches/9.x/templates/tiki-edit_structure.tpl =================================================================== --- branches/9.x/templates/tiki-edit_structure.tpl 2012-05-09 22:32:51 UTC (rev 41404) +++ branches/9.x/templates/tiki-edit_structure.tpl 2012-05-10 04:38:13 UTC (rev 41405) @@ -108,10 +108,10 @@ {if $prefs.feature_categories eq 'y'} <select name="categId"> <option value='' {if $find_categId eq ''}selected="selected"{/if}>{tr}any category{/tr}</option> - {section name=ix loop=$categories} - <option value="{$categories[ix].categId|escape}" - {if !empty($find_categId) and $find_categId eq $categories[ix].categId}selected="selected"{/if}>{tr}{$categories[ix].categpath}{/tr}</option> - {/section} + {foreach $categories as $catix} + <option value="{$catix.categId|escape}" + {if !empty($find_categId) and $find_categId eq $catix.categId}selected="selected"{/if}>{tr}{$catix.categpath}{/tr}</option> + {/foreach} </select> {/if} </td> Modified: branches/9.x/templates/tiki-search_replace.tpl =================================================================== --- branches/9.x/templates/tiki-search_replace.tpl 2012-05-09 22:32:51 UTC (rev 41404) +++ branches/9.x/templates/tiki-search_replace.tpl 2012-05-10 04:38:13 UTC (rev 41405) @@ -15,11 +15,11 @@ <br /> <select name="categId"> <option value='' {if $find_categId eq ''}selected="selected"{/if}>{tr}any category{/tr}</option> - {section name=ix loop=$categories} - <option value="{$categories[ix].categId|escape}" {if $find_categId eq $categories[ix].categId}selected="selected"{/if}> - {capture}{tr}{$categories[ix].categpath}{/tr}{/capture}{$smarty.capture.default|escape} + {foreach $categories as $catix} + <option value="{$catix.categId|escape}" {if $find_categId eq $catix.categId}selected="selected"{/if}> + {capture}{tr}{$catix.categpath}{/tr}{/capture}{$smarty.capture.default|escape} </option> - {/section} + {/foreach} </select> <input type="submit" name="search" value="{tr}Search{/tr}" /> </form> Modified: branches/9.x/templates/tiki-searchresults.tpl =================================================================== --- branches/9.x/templates/tiki-searchresults.tpl 2012-05-09 22:32:51 UTC (rev 41404) +++ branches/9.x/templates/tiki-searchresults.tpl 2012-05-10 04:38:13 UTC (rev 41405) @@ -67,11 +67,11 @@ <label class="findcateg"> <select name="categId"> <option value='' {if $find_categId eq ''}selected="selected"{/if}>{tr}any category{/tr}</option> - {section name=ix loop=$categories} - <option value="{$categories[ix].categId|escape}" {if $find_categId eq $categories[ix].categId}selected="selected"{/if}> - {capture}{tr}{$categories[ix].categpath}{/tr}{/capture}{$smarty.capture.default|escape} + {foreach $categories as $catix} + <option value="{$catix.categId|escape}" {if $find_categId eq $catix.categId}selected="selected"{/if}> + {capture}{tr}{$catix.categpath}{/tr}{/capture}{$smarty.capture.default|escape} </option> - {/section} + {/foreach} </select> </label> {if $prefs.javascript_enabled eq 'y'}<a href="#" onclick="show('category_multiselect_find');hide('category_singleselect_find');">{tr}Multiple select{/tr}</a>{/if} Modified: branches/9.x/templates/tiki-theme_control.tpl =================================================================== --- branches/9.x/templates/tiki-theme_control.tpl 2012-05-09 22:32:51 UTC (rev 41404) +++ branches/9.x/templates/tiki-theme_control.tpl 2012-05-10 04:38:13 UTC (rev 41405) @@ -26,11 +26,11 @@ <tr> <td> <select name="categId"> - {section name=ix loop=$categories} - <option value="{$categories[ix].categId|escape}" {if $categId eq $categories[ix].categId}selected="selected"{/if}> - {$categories[ix].name|escape} ({$categories[ix].categId}) + {foreach $categories as $catix} + <option value="{$catix.categId|escape}" {if $categId eq $catix.categId}selected="selected"{/if}> + {$catix.name|escape} ({$catix.categId}) </option> - {/section} + {/foreach} </select> </td> <td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xa...@us...> - 2012-05-25 11:22:23
|
Revision: 41579 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41579&view=rev Author: xavidp Date: 2012-05-25 11:22:13 +0000 (Fri, 25 May 2012) Log Message: ----------- [FIX]i18n of a couple of strings Modified Paths: -------------- branches/9.x/templates/tiki-timesheet.tpl branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl Modified: branches/9.x/templates/tiki-timesheet.tpl =================================================================== --- branches/9.x/templates/tiki-timesheet.tpl 2012-05-25 10:15:47 UTC (rev 41578) +++ branches/9.x/templates/tiki-timesheet.tpl 2012-05-25 11:22:13 UTC (rev 41579) @@ -16,8 +16,8 @@ <div id="jtrack-bar"> <a href="#" class="jtrack-create">{tr}New task{/tr}</a> | <a href="#" class="jtrack-remove-all">{tr}Delete all{/tr}</a> | - <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="Toggle completed" /> C - <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="Toggle archived" /> A + <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="{tr}Toggle completed{/tr}" /> C + <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="{tr}Toggle archived{/tr}" /> A </div> <div id="jtrack-content"> <div id="jtrack-form-list" class="jtrack-form"></div> @@ -146,4 +146,4 @@ </div> </div> {/if} -</div> \ No newline at end of file +</div> Modified: branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl =================================================================== --- branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl 2012-05-25 10:15:47 UTC (rev 41578) +++ branches/9.x/templates/wiki-plugins/wikiplugin_timesheet.tpl 2012-05-25 11:22:13 UTC (rev 41579) @@ -5,8 +5,8 @@ <div id="jtrack-bar"> <a href="#" class="jtrack-create">{tr}New task{/tr}</a> | <a href="#" class="jtrack-remove-all">{tr}Delete all{/tr}</a> | - <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="Toggle completed" /> C - <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="Toggle archived" /> A + <input type="checkbox" name="jtrack-show-completed" id="jtrack-show-completed" value="1" title="{tr}Toggle completed{/tr}" /> C + <input type="checkbox" name="jtrack-show-archived" id="jtrack-show-archived" value="1" title="{tr}Toggle archived{/tr}" /> A </div> <div id="jtrack-content"> <div id="jtrack-form-list" class="jtrack-form"></div> @@ -64,4 +64,4 @@ </div> </div> </div> -</div> \ No newline at end of file +</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cha...@us...> - 2012-05-31 19:37:56
|
Revision: 41679 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41679&view=rev Author: changi67 Date: 2012-05-31 19:37:49 +0000 (Thu, 31 May 2012) Log Message: ----------- [FIX] Cycle need to be declare outside the foreach Modified Paths: -------------- branches/9.x/templates/tiki-sheets.tpl branches/9.x/templates/tiki-sheets_listing.tpl Modified: branches/9.x/templates/tiki-sheets.tpl =================================================================== --- branches/9.x/templates/tiki-sheets.tpl 2012-05-31 19:12:04 UTC (rev 41678) +++ branches/9.x/templates/tiki-sheets.tpl 2012-05-31 19:37:49 UTC (rev 41679) @@ -23,6 +23,7 @@ <th>{self_link _sort_arg='sort_mode' _sort_field='user'}{tr}User{/tr}{/self_link}</th> <th>{tr}Actions{/tr}</th> </tr> + {cycle values="odd,even" print=false} {foreach item=sheet from=$sheets} {include name='base' file='tiki-sheets_listing.tpl' sheet=$sheet} {foreach item=childSheet from=$sheet.children} Modified: branches/9.x/templates/tiki-sheets_listing.tpl =================================================================== --- branches/9.x/templates/tiki-sheets_listing.tpl 2012-05-31 19:12:04 UTC (rev 41678) +++ branches/9.x/templates/tiki-sheets_listing.tpl 2012-05-31 19:37:49 UTC (rev 41679) @@ -1,7 +1,5 @@ {* $Id: tiki-sheets.tpl 35450 2011-07-17 19:03:36Z changi67 $ *} -{cycle values="odd,even" print=false} - <tr class="{cycle}"> <td class="text"> {if $sheet.parentSheetId} @@ -51,4 +49,4 @@ </a> {/if} </td> -</tr> \ No newline at end of file +</tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2012-06-14 18:29:52
|
Revision: 41958 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=41958&view=rev Author: marclaporte Date: 2012-06-14 18:29:46 +0000 (Thu, 14 Jun 2012) Log Message: ----------- More sensible defaults for user imports to groups and newsletters Modified Paths: -------------- branches/9.x/templates/tiki-admin_newsletter_subscriptions.tpl branches/9.x/templates/tiki-adminusers.tpl Modified: branches/9.x/templates/tiki-admin_newsletter_subscriptions.tpl =================================================================== --- branches/9.x/templates/tiki-admin_newsletter_subscriptions.tpl 2012-06-14 16:33:09 UTC (rev 41957) +++ branches/9.x/templates/tiki-admin_newsletter_subscriptions.tpl 2012-06-14 18:29:46 UTC (rev 41958) @@ -235,7 +235,7 @@ {tr}Don't send confirmation mail{/tr} </td> <td colspan="2"> - <input type="checkbox" name="confirmEmail" /> + <input type="checkbox" name="confirmEmail" checked="checked" /> </td> </tr> {/if} Modified: branches/9.x/templates/tiki-adminusers.tpl =================================================================== --- branches/9.x/templates/tiki-adminusers.tpl 2012-06-14 16:33:09 UTC (rev 41957) +++ branches/9.x/templates/tiki-adminusers.tpl 2012-06-14 18:29:46 UTC (rev 41958) @@ -524,9 +524,9 @@ <td> <input type="file" id="csvlist" name="csvlist"/> <br /> - <label><input type="radio" name="overwrite" value="y" checked="checked" /> {tr}Overwrite{/tr}</label> + <label><input type="radio" name="overwrite" value="y" /> {tr}Overwrite{/tr}</label> <br /> - <label><input type="radio" name="overwrite" value="n" /> {tr}Don't overwrite{/tr}</label> + <label><input type="radio" name="overwrite" value="n" checked="checked" /> {tr}Don't overwrite{/tr}</label> <br /> <label>{tr}Overwrite groups:{/tr} <input type="checkbox" name="overwriteGroup" /></label> <br /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jy...@us...> - 2012-06-26 10:49:55
|
Revision: 42091 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42091&view=rev Author: Jyhem Date: 2012-06-26 10:49:46 +0000 (Tue, 26 Jun 2012) Log Message: ----------- [FIX] Apparently, following last smart upgrade, we can't use tabs as spaces inside smarty plugins any more Modified Paths: -------------- branches/9.x/templates/comment-header.tpl branches/9.x/templates/tiki-live_support_admin.tpl branches/9.x/templates/tiki-page_bar.tpl branches/9.x/templates/tiki-sitelocbar.tpl branches/9.x/templates/tiki-view_forum.tpl branches/9.x/templates/tiki-wiki_topline.tpl Modified: branches/9.x/templates/comment-header.tpl =================================================================== --- branches/9.x/templates/comment-header.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/comment-header.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -9,7 +9,7 @@ {if $thread_style != 'commentStyle_headers' and $this_is_locked eq 'n' and $comment.threadId > 0} <div class="actions"> - {if $tiki_p_admin_forum eq 'y' + {if $tiki_p_admin_forum eq 'y' || ( $comment.userName == $user && $tiki_p_forum_edit_own_posts eq 'y' )} <a title="{tr}Edit{/tr}" {if $first eq 'y'} @@ -34,7 +34,7 @@ {self_link report=$comment.threadId _icon='delete' _alt="{tr}Report this post{/tr}" _title="{tr}Report this post{/tr}"}{/self_link} {/if} - {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} + {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} {self_link savenotepad=$comment.threadId _icon='disk' _alt="{tr}Save to notepad{/tr}" _title="{tr}Save to notepad{/tr}"}{/self_link} {/if} Modified: branches/9.x/templates/tiki-live_support_admin.tpl =================================================================== --- branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -1,8 +1,8 @@ {title help="Live+Support"}{tr}Live support system{/tr}{/title} <div class="navbar"> - {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} - {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} + {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} + {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} {button href="?show_html" _text="{tr}Generate HTML{/tr}"} {button href="tiki-live_support_transcripts.php" _text="{tr}Transcripts{/tr}"} </div> Modified: branches/9.x/templates/tiki-page_bar.tpl =================================================================== --- branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -41,7 +41,7 @@ {/if} {if $tiki_p_admin_wiki eq 'y' or $tiki_p_assign_perm_wiki_page eq 'y'} - {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} + {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} {/if} {if $prefs.feature_history eq 'y' and $tiki_p_wiki_view_history eq 'y'} Modified: branches/9.x/templates/tiki-sitelocbar.tpl =================================================================== --- branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -33,6 +33,6 @@ {/if} {/if} </div>{* bar with location indicator *} - {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} + {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} {else}{breadcrumbs type="desc" loc="site" crumbs=$crumbs}{/if} {/if} Modified: branches/9.x/templates/tiki-view_forum.tpl =================================================================== --- branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -13,9 +13,9 @@ {assign var=thisforum_info value=$forum_info.forumId} {if ($tiki_p_forum_post_topic eq 'y' and ($prefs.feature_wiki_discuss ne 'y' or $prefs.$forumId ne $prefs.wiki_forum_id)) or $tiki_p_admin_forum eq 'y'} {if !isset($comments_threadId) or $comments_threadId eq 0} - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} {else} - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} {/if} {/if} {if $tiki_p_admin_forum eq 'y' or !isset($all_forums) or $all_forums|@count > 1} Modified: branches/9.x/templates/tiki-wiki_topline.tpl =================================================================== --- branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:23:42 UTC (rev 42090) +++ branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:49:46 UTC (rev 42091) @@ -3,7 +3,7 @@ {if !isset($hide_page_header) or !$hide_page_header} <div class="wikiinfo" style="float: left"> {if $prefs.wiki_page_name_above eq 'y' and $print_page ne 'y'} - <a href="javascript:self.location=self.location;" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} + <a href="tiki-index.php?page={$page|escape:"url"}" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} {/if} {if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2012-06-26 12:50:21
|
Good catch. This Smarty upgrade sure has provoked several code cleanups, that have made our code base more uniform. I am so so happy we have a unified code base and when a dev finds an issue, it's an easy grep to fix similar issues elsewhere. Best regards, M ;-) On Tue, Jun 26, 2012 at 6:49 AM, <Jy...@us...> wrote: > Revision: 42091 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42091&view=rev > Author: Jyhem > Date: 2012-06-26 10:49:46 +0000 (Tue, 26 Jun 2012) > Log Message: > ----------- > [FIX] Apparently, following last smart upgrade, we can't use tabs as spaces inside smarty plugins any more > > Modified Paths: > -------------- > branches/9.x/templates/comment-header.tpl > branches/9.x/templates/tiki-live_support_admin.tpl > branches/9.x/templates/tiki-page_bar.tpl > branches/9.x/templates/tiki-sitelocbar.tpl > branches/9.x/templates/tiki-view_forum.tpl > branches/9.x/templates/tiki-wiki_topline.tpl > > Modified: branches/9.x/templates/comment-header.tpl > =================================================================== > --- branches/9.x/templates/comment-header.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/comment-header.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -9,7 +9,7 @@ > > {if $thread_style != 'commentStyle_headers' and $this_is_locked eq 'n' and $comment.threadId > 0} > <div class="actions"> > - {if $tiki_p_admin_forum eq 'y' > + {if $tiki_p_admin_forum eq 'y' > || ( $comment.userName == $user && $tiki_p_forum_edit_own_posts eq 'y' )} > <a title="{tr}Edit{/tr}" > {if $first eq 'y'} > @@ -34,7 +34,7 @@ > {self_link report=$comment.threadId _icon='delete' _alt="{tr}Report this post{/tr}" _title="{tr}Report this post{/tr}"}{/self_link} > {/if} > > - {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} > + {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} > {self_link savenotepad=$comment.threadId _icon='disk' _alt="{tr}Save to notepad{/tr}" _title="{tr}Save to notepad{/tr}"}{/self_link} > {/if} > > > Modified: branches/9.x/templates/tiki-live_support_admin.tpl > =================================================================== > --- branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -1,8 +1,8 @@ > {title help="Live+Support"}{tr}Live support system{/tr}{/title} > > <div class="navbar"> > - {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} > - {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} > + {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} > + {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} > {button href="?show_html" _text="{tr}Generate HTML{/tr}"} > {button href="tiki-live_support_transcripts.php" _text="{tr}Transcripts{/tr}"} > </div> > > Modified: branches/9.x/templates/tiki-page_bar.tpl > =================================================================== > --- branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -41,7 +41,7 @@ > {/if} > > {if $tiki_p_admin_wiki eq 'y' or $tiki_p_assign_perm_wiki_page eq 'y'} > - {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} > + {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} > {/if} > > {if $prefs.feature_history eq 'y' and $tiki_p_wiki_view_history eq 'y'} > > Modified: branches/9.x/templates/tiki-sitelocbar.tpl > =================================================================== > --- branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -33,6 +33,6 @@ > {/if} > {/if} > </div>{* bar with location indicator *} > - {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} > + {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} > {else}{breadcrumbs type="desc" loc="site" crumbs=$crumbs}{/if} > {/if} > > Modified: branches/9.x/templates/tiki-view_forum.tpl > =================================================================== > --- branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -13,9 +13,9 @@ > {assign var=thisforum_info value=$forum_info.forumId} > {if ($tiki_p_forum_post_topic eq 'y' and ($prefs.feature_wiki_discuss ne 'y' or $prefs.$forumId ne $prefs.wiki_forum_id)) or $tiki_p_admin_forum eq 'y'} > {if !isset($comments_threadId) or $comments_threadId eq 0} > - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} > + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} > {else} > - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} > + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} > {/if} > {/if} > {if $tiki_p_admin_forum eq 'y' or !isset($all_forums) or $all_forums|@count > 1} > > Modified: branches/9.x/templates/tiki-wiki_topline.tpl > =================================================================== > --- branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:23:42 UTC (rev 42090) > +++ branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:49:46 UTC (rev 42091) > @@ -3,7 +3,7 @@ > {if !isset($hide_page_header) or !$hide_page_header} > <div class="wikiinfo" style="float: left"> > {if $prefs.wiki_page_name_above eq 'y' and $print_page ne 'y'} > - <a href="javascript:self.location=self.location;" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} > + <a href="tiki-index.php?page={$page|escape:"url"}" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} > {/if} > > {if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'} > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs -- Marc Laporte http://MarcLaporte.com http://Tiki.org/MarcLaporte http://AvanTech.net |
From: Jonny B. <svn...@no...> - 2012-06-26 13:20:42
|
Yes, thanks Jyhem - good grepping! (i thought about it but couldn't think of the right pattern ;) jb On 26 Jun 2012, at 13:50, Marc Laporte wrote: > Good catch. > > This Smarty upgrade sure has provoked several code cleanups, that have > made our code base more uniform. > > I am so so happy we have a unified code base and when a dev finds an > issue, it's an easy grep to fix similar issues elsewhere. > > Best regards, > > M ;-) > > > > > On Tue, Jun 26, 2012 at 6:49 AM, <Jy...@us...> wrote: >> Revision: 42091 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42091&view=rev >> Author: Jyhem >> Date: 2012-06-26 10:49:46 +0000 (Tue, 26 Jun 2012) >> Log Message: >> ----------- >> [FIX] Apparently, following last smart upgrade, we can't use tabs as spaces inside smarty plugins any more >> >> Modified Paths: >> -------------- >> branches/9.x/templates/comment-header.tpl >> branches/9.x/templates/tiki-live_support_admin.tpl >> branches/9.x/templates/tiki-page_bar.tpl >> branches/9.x/templates/tiki-sitelocbar.tpl >> branches/9.x/templates/tiki-view_forum.tpl >> branches/9.x/templates/tiki-wiki_topline.tpl >> >> Modified: branches/9.x/templates/comment-header.tpl >> =================================================================== >> --- branches/9.x/templates/comment-header.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/comment-header.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -9,7 +9,7 @@ >> >> {if $thread_style != 'commentStyle_headers' and $this_is_locked eq 'n' and $comment.threadId > 0} >> <div class="actions"> >> - {if $tiki_p_admin_forum eq 'y' >> + {if $tiki_p_admin_forum eq 'y' >> || ( $comment.userName == $user && $tiki_p_forum_edit_own_posts eq 'y' )} >> <a title="{tr}Edit{/tr}" >> {if $first eq 'y'} >> @@ -34,7 +34,7 @@ >> {self_link report=$comment.threadId _icon='delete' _alt="{tr}Report this post{/tr}" _title="{tr}Report this post{/tr}"}{/self_link} >> {/if} >> >> - {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} >> + {if $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y' and $forumId} >> {self_link savenotepad=$comment.threadId _icon='disk' _alt="{tr}Save to notepad{/tr}" _title="{tr}Save to notepad{/tr}"}{/self_link} >> {/if} >> >> >> Modified: branches/9.x/templates/tiki-live_support_admin.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/tiki-live_support_admin.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -1,8 +1,8 @@ >> {title help="Live+Support"}{tr}Live support system{/tr}{/title} >> >> <div class="navbar"> >> - {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} >> - {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} >> + {button href='#' _onclick="javascript:window.open('tiki-live_support_console.php','','menubar=no,scrollbars=yes,resizable=yes,height=400,width=600');" _text="{tr}Open operator console{/tr}"} >> + {button href='#' _onclick="javascript:window.open('tiki-live_support_client.php','','menubar=no,scrollbars=yes,resizable=yes,height=450,width=300');" _text="{tr}Open client window{/tr}"} >> {button href="?show_html" _text="{tr}Generate HTML{/tr}"} >> {button href="tiki-live_support_transcripts.php" _text="{tr}Transcripts{/tr}"} >> </div> >> >> Modified: branches/9.x/templates/tiki-page_bar.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/tiki-page_bar.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -41,7 +41,7 @@ >> {/if} >> >> {if $tiki_p_admin_wiki eq 'y' or $tiki_p_assign_perm_wiki_page eq 'y'} >> - {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} >> + {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} >> {/if} >> >> {if $prefs.feature_history eq 'y' and $tiki_p_wiki_view_history eq 'y'} >> >> Modified: branches/9.x/templates/tiki-sitelocbar.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/tiki-sitelocbar.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -33,6 +33,6 @@ >> {/if} >> {/if} >> </div>{* bar with location indicator *} >> - {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} >> + {if $trail}{breadcrumbs type="desc" loc="site" crumbs=$trail} >> {else}{breadcrumbs type="desc" loc="site" crumbs=$crumbs}{/if} >> {/if} >> >> Modified: branches/9.x/templates/tiki-view_forum.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/tiki-view_forum.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -13,9 +13,9 @@ >> {assign var=thisforum_info value=$forum_info.forumId} >> {if ($tiki_p_forum_post_topic eq 'y' and ($prefs.feature_wiki_discuss ne 'y' or $prefs.$forumId ne $prefs.wiki_forum_id)) or $tiki_p_admin_forum eq 'y'} >> {if !isset($comments_threadId) or $comments_threadId eq 0} >> - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} >> + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} >> {else} >> - {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} >> + {button href="tiki-view_forum.php?openpost=1&forumId=$thisforum_info&comments_threadId=0&comments_threshold=$comments_threshold&comments_offset=$comments_offset&thread_sort_mode=$thread_sort_mode&comments_per_page=$comments_per_page" _onclick="javascript:show('forumpost');return false;" _text="{tr}New Topic{/tr}"} >> {/if} >> {/if} >> {if $tiki_p_admin_forum eq 'y' or !isset($all_forums) or $all_forums|@count > 1} >> >> Modified: branches/9.x/templates/tiki-wiki_topline.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:23:42 UTC (rev 42090) >> +++ branches/9.x/templates/tiki-wiki_topline.tpl 2012-06-26 10:49:46 UTC (rev 42091) >> @@ -3,7 +3,7 @@ >> {if !isset($hide_page_header) or !$hide_page_header} >> <div class="wikiinfo" style="float: left"> >> {if $prefs.wiki_page_name_above eq 'y' and $print_page ne 'y'} >> - <a href="javascript:self.location=self.location;" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} >> + <a href="tiki-index.php?page={$page|escape:"url"}" class="titletop" title="{tr}refresh{/tr}">{$page|escape}</a> {* The hard-coded spaces help selecting the page name for inclusion in a wiki link *} >> {/if} >> >> {if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'} >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> >> ------------------------------------------------------------------------------ >> Live Security Virtual Conference >> Exclusive live event will cover all the ways today's security and >> threat landscape has changed and how IT managers can respond. Discussions >> will include endpoint security, mobile security and the latest in malware >> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > -- > Marc Laporte > > http://MarcLaporte.com > http://Tiki.org/MarcLaporte > http://AvanTech.net > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: <Jy...@us...> - 2012-06-26 13:05:57
|
Revision: 42092 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42092&view=rev Author: Jyhem Date: 2012-06-26 13:05:46 +0000 (Tue, 26 Jun 2012) Log Message: ----------- [FIX] Apparently, following last smart upgrade, we can't use tabs as spaces inside smarty plugins any more Modified Paths: -------------- branches/9.x/templates/styles/mobile/tiki-page_bar.tpl branches/9.x/templates/tiki-browse_gallery.tpl branches/9.x/templates/tiki-invoice_menu.tpl branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl Modified: branches/9.x/templates/styles/mobile/tiki-page_bar.tpl =================================================================== --- branches/9.x/templates/styles/mobile/tiki-page_bar.tpl 2012-06-26 10:49:46 UTC (rev 42091) +++ branches/9.x/templates/styles/mobile/tiki-page_bar.tpl 2012-06-26 13:05:46 UTC (rev 42092) @@ -41,7 +41,7 @@ {/if} {if $tiki_p_admin_wiki eq 'y' or $tiki_p_assign_perm_wiki_page eq 'y'} - {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} + {button _keepall='y' href="tiki-objectpermissions.php" objectId=$page objectName=$page objectType="wiki+page" permType="wiki" _text="{tr}Permissions{/tr}"} {/if} {if $prefs.feature_history eq 'y' and $tiki_p_wiki_view_history eq 'y'} Modified: branches/9.x/templates/tiki-browse_gallery.tpl =================================================================== --- branches/9.x/templates/tiki-browse_gallery.tpl 2012-06-26 10:49:46 UTC (rev 42091) +++ branches/9.x/templates/tiki-browse_gallery.tpl 2012-06-26 13:05:46 UTC (rev 42092) @@ -26,7 +26,7 @@ {if $tiki_p_assign_perm_image_gallery eq 'y'} {assign var=thisname value=$name|escape:"url"} - {button href="tiki-objectpermissions.php?objectName=$thisname&objectType=image+gallery&permType=image+galleries&objectId=$galleryId" _text="{tr}Perms{/tr}"} + {button href="tiki-objectpermissions.php?objectName=$thisname&objectType=image+gallery&permType=image+galleries&objectId=$galleryId" _text="{tr}Perms{/tr}"} {/if} {/if} Modified: branches/9.x/templates/tiki-invoice_menu.tpl =================================================================== --- branches/9.x/templates/tiki-invoice_menu.tpl 2012-06-26 10:49:46 UTC (rev 42091) +++ branches/9.x/templates/tiki-invoice_menu.tpl 2012-06-26 13:05:46 UTC (rev 42092) @@ -1,8 +1,8 @@ <div class="TikiInvoiceMenu"> - {button href="tiki-list_invoices.php" _text="{tr}Invoices{/tr}"} - {button href="tiki-edit_invoice.php" _text="{tr}New Invoice{/tr}"} + {button href="tiki-list_invoices.php" _text="{tr}Invoices{/tr}"} + {button href="tiki-edit_invoice.php" _text="{tr}New Invoice{/tr}"} {button href="tiki-list_invoice_clients.php" _text="{tr}Clients{/tr}"} {button href="tiki-edit_invoice_client.php" _text="{tr}New Client{/tr}"} {button href="tiki-invoice_reports.php" _text="{tr}Reports{/tr}"} - {button href="tiki-admin_invoices.php" _text="{tr}Settings{/tr}"} -</div> \ No newline at end of file + {button href="tiki-admin_invoices.php" _text="{tr}Settings{/tr}"} +</div> Modified: branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl =================================================================== --- branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl 2012-06-26 10:49:46 UTC (rev 42091) +++ branches/9.x/templates/wiki-plugins/wikiplugin_bigbluebutton.tpl 2012-06-26 13:05:46 UTC (rev 42092) @@ -7,7 +7,7 @@ {tr}Meeting ID:{/tr} {$bbb_meeting|escape} {permission type=bigbluebutton object=$bbb_meeting name=tiki_p_assign_perm_bigbluebutton} - {button href="tiki-objectpermissions.php?objectId=`$bbb_meeting|escape:'url'`&objectName=`$bbb_meeting|escape:'url'`&objectType=bigbluebutton&permType=bigbluebutton" _text="{tr}Permissions{/tr}"} + {button href="tiki-objectpermissions.php?objectId=`$bbb_meeting|escape:'url'`&objectName=`$bbb_meeting|escape:'url'`&objectType=bigbluebutton&permType=bigbluebutton" _text="{tr}Permissions{/tr}"} {/permission} {if ! $user} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chi...@us...> - 2012-07-07 10:24:41
|
Revision: 42250 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42250&view=rev Author: chibaguy Date: 2012-07-07 10:24:34 +0000 (Sat, 07 Jul 2012) Log Message: ----------- [FIX] Break tag causes unwanted white space and should be redundant when containing div has clearfix class. Modified Paths: -------------- branches/9.x/templates/article_trailer.tpl branches/9.x/templates/comment-header.tpl branches/9.x/templates/tiki-stats.tpl Modified: branches/9.x/templates/article_trailer.tpl =================================================================== --- branches/9.x/templates/article_trailer.tpl 2012-07-06 19:11:08 UTC (rev 42249) +++ branches/9.x/templates/article_trailer.tpl 2012-07-07 10:24:34 UTC (rev 42250) @@ -1,5 +1,5 @@ {if !isset($preview)} - <div class="articletrailer"> + <div class="clearfix articletrailer"> <span> {if $show_size eq 'y'} ({$size} {tr}bytes{/tr}) @@ -42,5 +42,4 @@ {/if} </div> </div> - <br class="clear" /> {/if} \ No newline at end of file Modified: branches/9.x/templates/comment-header.tpl =================================================================== --- branches/9.x/templates/comment-header.tpl 2012-07-06 19:11:08 UTC (rev 42249) +++ branches/9.x/templates/comment-header.tpl 2012-07-07 10:24:34 UTC (rev 42250) @@ -80,5 +80,4 @@ {if $thread_style eq 'commentStyle_headers'} {include file='comment-footer.tpl' comment=$comments_coms[rep]} {/if} - <br class="clear" /> -</div> +</div> \ No newline at end of file Modified: branches/9.x/templates/tiki-stats.tpl =================================================================== --- branches/9.x/templates/tiki-stats.tpl 2012-07-06 19:11:08 UTC (rev 42249) +++ branches/9.x/templates/tiki-stats.tpl 2012-07-07 10:24:34 UTC (rev 42250) @@ -2,7 +2,7 @@ {title help="Stats"}{tr}Stats{/tr}{/title} -<div class="navbar"> +<div class="clearfix navbar"> {button _anchor="site_stats" _text="{tr}Site{/tr}"} {if $wiki_stats}{button _anchor="wiki_stats" _text="{tr}Wiki{/tr}"}{/if} {if $igal_stats}{button _anchor="igal_stats" _text="{tr}Image galleries{/tr}"}{/if} @@ -19,8 +19,6 @@ {if $best_objects_stats_lastweek}{button _anchor="best_objects_stats_lastweek" _text="{tr}Most viewed objects in the last 7 days{/tr}"}{/if} </div> -<br class="clear" /> - <h2 id="site_stats">{tr}Site Stats{/tr}</h2> {cycle values="odd,even" print=false advance=false} <table class="formcolor"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-07-07 15:51:58
|
Revision: 42256 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42256&view=rev Author: jonnybradley Date: 2012-07-07 15:51:52 +0000 (Sat, 07 Jul 2012) Log Message: ----------- [REF] breadcrumbs: Move template code into module tpl and remove redundant file Modified Paths: -------------- branches/9.x/templates/modules/mod-breadcrumbs.tpl Removed Paths: ------------- branches/9.x/templates/tiki-sitelocbar.tpl Modified: branches/9.x/templates/modules/mod-breadcrumbs.tpl =================================================================== --- branches/9.x/templates/modules/mod-breadcrumbs.tpl 2012-07-07 15:46:43 UTC (rev 42255) +++ branches/9.x/templates/modules/mod-breadcrumbs.tpl 2012-07-07 15:51:52 UTC (rev 42256) @@ -1,5 +1,43 @@ {* $Id$ *} {tikimodule error=$module_params.error title=$tpl_module_title name=$tpl_module_name flip=$module_params.flip decorations=$module_params.decorations nobox=$module_params.nobox notitle=$module_params.notitle} -{include file="tiki-sitelocbar.tpl"} + {strip} + {if $prefs.feature_siteloc eq 'y' and $prefs.feature_breadcrumbs eq 'y'} + <div id="sitelocbar"> + {if $prefs.feature_siteloclabel eq 'y'}{tr}Location : {/tr}{/if} + {if $trail} + {breadcrumbs type="trail" loc="site" crumbs=$trail} + {breadcrumbs type="pagetitle" loc="site" crumbs=$trail} + {else} + <a title="{tr}{$crumbs[0]->description}{/tr}" href="{$crumbs[0]->url}" accesskey="1">{$crumbs[0]->title}</a> + {if $structure eq 'y'} + {section loop=$structure_path name=ix} + {$prefs.site_crumb_seper|escape:"html"} + {if $structure_path[ix].pageName ne $page or $structure_path[ix].page_alias ne $page_info.page_alias} + <a href="tiki-index.php?page_ref_id={$structure_path[ix].page_ref_id}"> + {/if} + {if $structure_path[ix].page_alias} + {$structure_path[ix].page_alias} + {else} + {$structure_path[ix].pageName} + {/if} + {if $structure_path[ix].pageName ne $page or $structure_path[ix].page_alias ne $page_info.page_alias} + </a> + {/if} + {/section} + {else} + {if $page ne ''}{$prefs.site_crumb_seper|escape:"html"} {$page|escape} + {elseif $title ne ''}{$prefs.site_crumb_seper|escape:"html"} {$title} + {elseif $thread_info.title ne ''}{$prefs.site_crumb_seper|escape:"html"} {$thread_info.title} + {elseif $forum_info.name ne ''}{$prefs.site_crumb_seper|escape:"html"} {$forum_info.name}{/if} + {/if} + {/if} + </div>{* bar with location indicator *} + {if $trail} + {breadcrumbs type="desc" loc="site" crumbs=$trail} + {else} + {breadcrumbs type="desc" loc="site" crumbs=$crumbs} + {/if} + {/if} + {/strip} {/tikimodule} \ No newline at end of file Deleted: branches/9.x/templates/tiki-sitelocbar.tpl =================================================================== --- branches/9.x/templates/tiki-sitelocbar.tpl 2012-07-07 15:46:43 UTC (rev 42255) +++ branches/9.x/templates/tiki-sitelocbar.tpl 2012-07-07 15:51:52 UTC (rev 42256) @@ -1,41 +0,0 @@ -{* $Id$ *} -{* breadcrumbs (site header location) *} -{strip} -{if $prefs.feature_siteloc eq 'y' and $prefs.feature_breadcrumbs eq 'y'} - <div id="sitelocbar"> - {if $prefs.feature_siteloclabel eq 'y'}{tr}Location : {/tr}{/if} - {if $trail} - {breadcrumbs type="trail" loc="site" crumbs=$trail} - {breadcrumbs type="pagetitle" loc="site" crumbs=$trail} - {else} - <a title="{tr}{$crumbs[0]->description}{/tr}" href="{$crumbs[0]->url}" accesskey="1">{$crumbs[0]->title}</a> - {if $structure eq 'y'} - {section loop=$structure_path name=ix} - {$prefs.site_crumb_seper|escape:"html"} - {if $structure_path[ix].pageName ne $page or $structure_path[ix].page_alias ne $page_info.page_alias} - <a href="tiki-index.php?page_ref_id={$structure_path[ix].page_ref_id}"> - {/if} - {if $structure_path[ix].page_alias} - {$structure_path[ix].page_alias} - {else} - {$structure_path[ix].pageName} - {/if} - {if $structure_path[ix].pageName ne $page or $structure_path[ix].page_alias ne $page_info.page_alias} - </a> - {/if} - {/section} - {else} - {if $page ne ''}{$prefs.site_crumb_seper|escape:"html"} {$page|escape} - {elseif $title ne ''}{$prefs.site_crumb_seper|escape:"html"} {$title} - {elseif $thread_info.title ne ''}{$prefs.site_crumb_seper|escape:"html"} {$thread_info.title} - {elseif $forum_info.name ne ''}{$prefs.site_crumb_seper|escape:"html"} {$forum_info.name}{/if} - {/if} - {/if} - </div>{* bar with location indicator *} - {if $trail} - {breadcrumbs type="desc" loc="site" crumbs=$trail} - {else} - {breadcrumbs type="desc" loc="site" crumbs=$crumbs} - {/if} -{/if} -{/strip} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cha...@us...> - 2012-07-12 20:53:01
|
Revision: 42367 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42367&view=rev Author: changi67 Date: 2012-07-12 20:52:55 +0000 (Thu, 12 Jul 2012) Log Message: ----------- [FIX] img and input doesn't need closing tag Modified Paths: -------------- branches/9.x/templates/tiki-create_multilang_pages.tpl branches/9.x/templates/tiki-pick_avatar.tpl Modified: branches/9.x/templates/tiki-create_multilang_pages.tpl =================================================================== --- branches/9.x/templates/tiki-create_multilang_pages.tpl 2012-07-12 20:39:36 UTC (rev 42366) +++ branches/9.x/templates/tiki-create_multilang_pages.tpl 2012-07-12 20:52:55 UTC (rev 42367) @@ -29,7 +29,7 @@ <P></P> <form enctype="multipart/form-data" method="post" action="tiki-create_multilang_pages.php" id='create_multilang_pages_form' name='create_multilang_pages_form'> - <input type="hidden" name="create_pages" value=""></input> + <input type="hidden" name="create_pages" value=""/> <b>{tr}Preferred languages{/tr}</b> <P></P> <table> @@ -37,7 +37,7 @@ {foreach from=$user_languages key=index item=lang_id} <tr> <td>{$lang_id}:</td> <td> </td> - <td><input type="text" name="page_name_{$lang_id}"></input></td> + <td><input type="text" name="page_name_{$lang_id}"/></td> </tr> {/foreach} @@ -52,7 +52,7 @@ {foreach from=$other_languages key=index item=lang_id} <tr> <td>{$lang_id}:</td> <td> </td> - <td><input type="text" name="page_name_{$lang_id}"></input></td> + <td><input type="text" name="page_name_{$lang_id}"/></td> </tr> {/foreach} Modified: branches/9.x/templates/tiki-pick_avatar.tpl =================================================================== --- branches/9.x/templates/tiki-pick_avatar.tpl 2012-07-12 20:39:36 UTC (rev 42366) +++ branches/9.x/templates/tiki-pick_avatar.tpl 2012-07-12 20:52:55 UTC (rev 42367) @@ -25,7 +25,7 @@ </div> {if isset($user_picture_id)} <div>{tr}Full size{/tr}<br /> -<img src="tiki-download_file.php?fileId={$user_picture_id|escape}&display=y"></img> +<img src="tiki-download_file.php?fileId={$user_picture_id|escape}&display=y"/> </div> {/if} {else}{tr}no avatar{/tr}{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-07-18 09:37:55
|
Revision: 42405 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42405&view=rev Author: jonnybradley Date: 2012-07-18 09:37:44 +0000 (Wed, 18 Jul 2012) Log Message: ----------- [FIX] debug: Move smarty debug call to end of tiki.tpl (thanks marclaporte) Modified Paths: -------------- branches/9.x/templates/modules/mod-quickadmin.tpl branches/9.x/templates/tiki.tpl Modified: branches/9.x/templates/modules/mod-quickadmin.tpl =================================================================== --- branches/9.x/templates/modules/mod-quickadmin.tpl 2012-07-17 23:56:18 UTC (rev 42404) +++ branches/9.x/templates/modules/mod-quickadmin.tpl 2012-07-18 09:37:44 UTC (rev 42405) @@ -27,9 +27,6 @@ {icon _id=book title="{tr}SysLogs{/tr}" href="tiki-syslog.php"} {icon _id=module title="{tr}Modules{/tr}" href="tiki-admin_modules.php"} {if $prefs.feature_debug_console} - {if !empty($smarty.request.show_smarty_debug)} - {debug} - {/if} {icon _id=bug title="{tr}Open Smarty debug window{/tr}" href="{query _type='relative' show_smarty_debug=1}"} {/if} </div> Modified: branches/9.x/templates/tiki.tpl =================================================================== --- branches/9.x/templates/tiki.tpl 2012-07-17 23:56:18 UTC (rev 42404) +++ branches/9.x/templates/tiki.tpl 2012-07-18 09:37:44 UTC (rev 42405) @@ -196,3 +196,6 @@ {/if} </body> </html> +{if !empty($smarty.request.show_smarty_debug)} + {debug} +{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-07-29 16:14:54
|
Revision: 42494 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42494&view=rev Author: jonnybradley Date: 2012-07-29 16:14:48 +0000 (Sun, 29 Jul 2012) Log Message: ----------- [FIX] filegals: Observe line breaks in descriptions for popup info (by converting popup layout to a table) Modified Paths: -------------- branches/9.x/templates/browse_file_gallery.tpl branches/9.x/templates/list_file_gallery_content.tpl Modified: branches/9.x/templates/browse_file_gallery.tpl =================================================================== --- branches/9.x/templates/browse_file_gallery.tpl 2012-07-29 16:03:04 UTC (rev 42493) +++ branches/9.x/templates/browse_file_gallery.tpl 2012-07-29 16:14:48 UTC (rev 42494) @@ -34,7 +34,7 @@ <div class='opaque'> <div class='box-title'>{tr}Properties{/tr}</div> <div class='box-data'> - <div> + <table> {foreach item=prop key=propname from=$fgal_listing_conf} {if isset($prop.key)} {assign var=propkey value=$item.key} @@ -48,16 +48,18 @@ {assign var=propval value=$propval|tiki_long_date} {elseif $propname eq 'last_user' or $propname eq 'author' or $propname eq 'creator'} {assign var=propval value=$propval|username} - {elseif $propname eq 'size'} - {assign var=propval value=$propval|kbsize:true} + {elseif $propname eq 'size'} + {assign var=propval value=$propval|kbsize:true} + {elseif $propname eq 'description'} + {assign var=propval value=$propval|nl2br} {/if} {if isset($gal_info.$propkey) and $propval neq '' and $propname neq 'name' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' or ( $gal_info.$propkey eq 'y' and $show_details neq 'y' ) )} - <b>{$fgal_listing_conf.$propname.name}</b>: {$propval}<br /> + <tr><td><b>{$fgal_listing_conf.$propname.name}</b>:</td> <td>{$propval}</td></tr> {assign var=nb_over_infos value=$nb_over_infos+1} {/if} {/foreach} - </div> + </table> </div> </div> {/strip}{/capture} Modified: branches/9.x/templates/list_file_gallery_content.tpl =================================================================== --- branches/9.x/templates/list_file_gallery_content.tpl 2012-07-29 16:03:04 UTC (rev 42493) +++ branches/9.x/templates/list_file_gallery_content.tpl 2012-07-29 16:14:48 UTC (rev 42494) @@ -150,7 +150,7 @@ <div class='opaque'> <div class='box-title'>{tr}Properties{/tr}</div> <div class='box-data'> - <div> + <table> {foreach item=prop key=propname from=$fgal_listing_conf} {if isset($prop.key)} {assign var=propkey value=$item.key} @@ -172,15 +172,16 @@ {assign var=propval value=$propval|kbsize:true} {elseif $propname eq 'backlinks'} {assign var=propval value=$files[changes].nbBacklinks} + {elseif $propname eq 'description'} + {assign var=propval value=$propval|nl2br} {/if} {if isset($gal_info.$propkey) and $propval neq '' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' )} - <b>{$fgal_listing_conf.$propname.name}</b>: {$propval} - <br /> + <tr><td><b>{$fgal_listing_conf.$propname.name}</b>:</td> <td>{$propval}</td></tr> {assign var=nb_over_infos value=$nb_over_infos+1} {/if} {/foreach} - </div> + </table> </div> </div> {/strip} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-08-15 17:38:23
|
Revision: 42579 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42579&view=rev Author: jonnybradley Date: 2012-08-15 17:38:17 +0000 (Wed, 15 Aug 2012) Log Message: ----------- [FIX] user filegals: List & browse gallery name - needs fixing in other places too but will refactor after Tiki 9.1 Modified Paths: -------------- branches/9.x/templates/browse_file_gallery.tpl branches/9.x/templates/list_file_gallery_content.tpl Modified: branches/9.x/templates/browse_file_gallery.tpl =================================================================== --- branches/9.x/templates/browse_file_gallery.tpl 2012-08-15 16:53:43 UTC (rev 42578) +++ branches/9.x/templates/browse_file_gallery.tpl 2012-08-15 17:38:17 UTC (rev 42579) @@ -167,7 +167,11 @@ <div class="thumbnamecontener"> <div class="thumbname"> <div class="thumbnamesub" style="width:{$thumbnail_size}px; overflow: hidden;"> - {if $gal_info.show_name eq 'f' or ($gal_info.show_name eq 'a' and $files[changes].name eq '')} + {if $files[changes].isgal eq 1 and $files[changes].type eq 'user'} + <a class="fgalname" {$link}> + {if $files[changes].user eq $user}<strong>{tr}My Files{/tr}</strong>{else}{tr}Files of {$files[changes].user}{/tr}{/if} + </a> + {elseif $gal_info.show_name eq 'f' or ($gal_info.show_name eq 'a' and $files[changes].name eq '')} <a class="fgalname" {$link} title="{$files[changes].filename}">{$files[changes].filename|truncate:$key_name_len}</a> {else} {$propval} Modified: branches/9.x/templates/list_file_gallery_content.tpl =================================================================== --- branches/9.x/templates/list_file_gallery_content.tpl 2012-08-15 16:53:43 UTC (rev 42578) +++ branches/9.x/templates/list_file_gallery_content.tpl 2012-08-15 17:38:17 UTC (rev 42579) @@ -304,6 +304,13 @@ {/if} {assign var=propval value="$propval<br><span class=\"description\">`$desc`</span>"} {/if} + {if $files[changes].isgal eq 1 and $files[changes].type eq 'user'} + {if $files[changes].user eq $user} + {assign var=propval value="<strong>{tr}My Files{/tr}</strong>"} + {else} + {assign var=propval value="{tr}Files of {/tr}"|cat:$files[changes].user} + {/if} + {/if} {elseif $propname eq 'created' or $propname eq 'lastModif' or $propname eq 'lastDownload'} {if empty($propval)} {assign var=propval value=''} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-09-27 13:42:21
|
Revision: 43169 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43169&view=rev Author: jonnybradley Date: 2012-09-27 13:42:10 +0000 (Thu, 27 Sep 2012) Log Message: ----------- [FIX] menus: Partial rollback of r43167 - Undo over enthusiastic replacing of menus_item_names_raw with escape_menu_labels, as menus_item_names_raw actually also affects the urls as well. Revision Links: -------------- http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43167&view=rev Modified Paths: -------------- branches/9.x/templates/tiki-admin_menu_options.tpl branches/9.x/templates/tiki-user_cssmenu.tpl branches/9.x/templates/tiki-user_menu.tpl Modified: branches/9.x/templates/tiki-admin_menu_options.tpl =================================================================== --- branches/9.x/templates/tiki-admin_menu_options.tpl 2012-09-27 13:03:11 UTC (rev 43168) +++ branches/9.x/templates/tiki-admin_menu_options.tpl 2012-09-27 13:42:10 UTC (rev 43169) @@ -62,7 +62,7 @@ <a href="tiki-admin_menu_options.php?menuId={$menuId}&offset={$offset}&sort_mode={$sort_mode}&optionId={$channels[user].optionId}&maxRecords={$maxRecords}{if !empty($nbRecords)}&nbRecords={$nbRecords}{/if}" title="{tr}Edit{/tr}">{if $escape_menu_labels}{$channels[user].name|escape}{else}{$channels[user].name}{/if}</a> <div style="margin-left:10px;"> {if $channels[user].url} - {tr}URL:{/tr} <a href="{if $escape_menu_labels}{$channels[user].url|escape}{else}{$channels[user].url}{/if}" class="link" target="_blank" title="{$channels[user].canonic|escape}">{$channels[user].canonic|truncate:40:' ...'|escape}</a> + {tr}URL:{/tr} <a href="{if $prefs.menus_item_names_raw eq 'n'}{$channels[user].url|escape}{else}{$channels[user].url}{/if}" class="link" target="_blank" title="{$channels[user].canonic|escape}">{$channels[user].canonic|truncate:40:' ...'|escape}</a> {/if} {if $channels[user].section}<br />{tr}Sections:{/tr} {$channels[user].section}{/if} {if $channels[user].perm}<br />{tr}Permissions:{/tr} {$channels[user].perm}{/if} Modified: branches/9.x/templates/tiki-user_cssmenu.tpl =================================================================== --- branches/9.x/templates/tiki-user_cssmenu.tpl 2012-09-27 13:03:11 UTC (rev 43168) +++ branches/9.x/templates/tiki-user_cssmenu.tpl 2012-09-27 13:42:10 UTC (rev 43169) @@ -34,7 +34,7 @@ {/if} <li class="option{$chdata.optionId} menuSection menuSection{$opensec} menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}"> - <a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{if $escape_menu_labels}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"{/if}> + <a{if !empty($chdata.url)} href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{if $prefs.menus_item_names_raw eq 'n'}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"{/if}> {if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0} {icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path} {elseif isset($icon) and $icon} @@ -54,7 +54,7 @@ {* ----------------------------- option *} {elseif $chdata.type eq 'o'} <li class="option{$chdata.optionId} menuOption menuLevel{$opensec}{if isset($chdata.selected) and $chdata.selected} selected{/if}{if isset($chdata.selectedAscendant) and $chdata.selectedAscendant} selectedAscendant{/if}"> - <a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{if $escape_menu_labels}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"> + <a href="{if $prefs.feature_sefurl eq 'y' and $chdata.sefurl}{$chdata.sefurl|escape}{else}{if $prefs.menus_item_names_raw eq 'n'}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"> {if $menu_type eq 'vert' and $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and $opensec eq 0} {icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path} {/if} Modified: branches/9.x/templates/tiki-user_menu.tpl =================================================================== --- branches/9.x/templates/tiki-user_menu.tpl 2012-09-27 13:03:11 UTC (rev 43168) +++ branches/9.x/templates/tiki-user_menu.tpl 2012-09-27 13:42:10 UTC (rev 43169) @@ -35,7 +35,7 @@ </span> {if $chdata.url and $link_on_section eq 'y'} <span class="separatoricon-url" style="display:none"> - <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $escape_menu_labels}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"> + <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $prefs.menus_item_names_raw eq 'n'}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}"> {icon _id=$chdata.icon alt="{tr}Toggle{/tr}" _defaultdir=$prefs.menus_items_icons_path} </a> </span> @@ -70,7 +70,7 @@ {/if} {/if} {if $chdata.url and $link_on_section eq 'y'} - <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $escape_menu_labels}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}" class="separator"> + <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $prefs.menus_item_names_raw eq 'n'}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}" class="separator"> {else} <a href="javascript:icntoggle('menu{$cname}');" class="separator"> {/if} @@ -96,7 +96,7 @@ {* ----------------------------- option *} {elseif $chdata.type eq 'o'} <div class="option{$chdata.optionId} option{$sep}{if isset($chdata.selected) and $chdata.selected} selected{/if}"> - <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $escape_menu_labels}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}" class="linkmenu"> + <a href="{if $prefs.feature_sefurl eq 'y' and !empty($chdata.sefurl)}{$chdata.sefurl|escape}{else}{if $prefs.menus_item_names_raw eq 'n'}{$chdata.url|escape}{else}{$chdata.url}{/if}{/if}" class="linkmenu"> {if $prefs.menus_items_icons eq 'y' and $menu_info.use_items_icons eq 'y' and ($opensec eq 0 or $chdata.icon neq '')} {icon _id=$chdata.icon alt='' _defaultdir=$prefs.menus_items_icons_path} {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2012-11-06 02:41:55
|
Revision: 43795 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43795&view=rev Author: luatdo Date: 2012-11-06 02:41:48 +0000 (Tue, 06 Nov 2012) Log Message: ----------- because of system submission is wrong.now I use article place submission.we hide check box published,and can't view if not published. Modified Paths: -------------- branches/9.x/templates/article.tpl branches/9.x/templates/article_trailer.tpl branches/9.x/templates/tiki-list_articles.tpl branches/9.x/templates/tiki-view_articles.tpl Modified: branches/9.x/templates/article.tpl =================================================================== --- branches/9.x/templates/article.tpl 2012-11-05 20:28:52 UTC (rev 43794) +++ branches/9.x/templates/article.tpl 2012-11-06 02:41:48 UTC (rev 43795) @@ -11,9 +11,9 @@ {/if} <span class="titleb"> - {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} - {/if} - {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} - {/if} - {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} - {/if} + {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} {/if} + {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} {/if} + {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} {/if} {if $show_reads eq 'y'}({$reads} {tr}Reads{/tr}){/if} </span> <br /> Modified: branches/9.x/templates/article_trailer.tpl =================================================================== --- branches/9.x/templates/article_trailer.tpl 2012-11-05 20:28:52 UTC (rev 43794) +++ branches/9.x/templates/article_trailer.tpl 2012-11-06 02:41:48 UTC (rev 43795) @@ -1,5 +1,5 @@ {if !isset($preview)} - <div class="clearfix articletrailer"> + <div class="articletrailer"> <span> {if $show_size eq 'y'} ({$size} {tr}bytes{/tr}) @@ -11,9 +11,11 @@ {include file='translated-lang.tpl' object_type='article'} </div> {/if} + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} {if $tiki_p_edit_article eq 'y'} <a class="icon" href="tiki-edit_article.php?articleId={$articleId}">{icon _id='page_edit'}</a> {/if} + {/if} {if $prefs.feature_cms_print eq 'y'} <a class="icon" href="tiki-print_article.php?articleId={$articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> {/if} @@ -30,16 +32,19 @@ }, {button:false}); //Output your customized button - document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="https://ws.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); + document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); //Tie customized button to ShareThis button functionality. var element{/literal}{$articleId}{literal} = document.getElementById("share{/literal}{$articleId}{literal}"); object{/literal}{$articleId}{literal}.attachButton(element{/literal}{$articleId}{literal}); </script>{/literal} {/if} {if $prefs.feature_tell_a_friend eq 'y' && $tiki_p_tell_a_friend eq 'y'} <a title="{tr}Send a link{/tr}" href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{icon _id='email_link' alt="{tr}Send a link{/tr}"}</a> {/if} + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} {if $tiki_p_remove_article eq 'y'} <a class="icon" href="tiki-list_articles.php?remove={$articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> {/if} + {/if} </div> </div> -{/if} + <br class="clear" /> +{/if} \ No newline at end of file Modified: branches/9.x/templates/tiki-list_articles.tpl =================================================================== --- branches/9.x/templates/tiki-list_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) +++ branches/9.x/templates/tiki-list_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) @@ -91,15 +91,20 @@ {assign var=numbercol value=$numbercol+1} <th>{tr}Image{/tr}</th> {/if} - <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y'} + <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> + {/if}--> + {if $tiki_p_edit_article eq 'y' or $tiki_p_remove_article eq 'y' or isset($oneEditPage) or $tiki_p_read_article} {assign var=numbercol value=$numbercol+1} - <th>{tr}Actions{/tr}</th> + <th>{tr}Actions{/tr} </th> {/if} + </tr> {cycle values="odd,even" print=false} {section name=changes loop=$listpages} <tr class="{cycle}"> + {if $listpages[changes].ispublished eq 'y' or $tiki_p_approve_submission eq 'y' or ($listpages[changes].ispublished eq 'n' and $listpages[changes].authorName|escape eq $user) } <td class="checkbox"> <input type="checkbox" name="checked[]" value="{$listpages[changes].articleId|escape}" {if $listpages[changes].checked eq 'y'}checked="checked" {/if}/> </td> @@ -151,22 +156,36 @@ {if $prefs.art_list_img eq 'y'} <td class="text">{tr}{$listpages[changes].hasImage}{/tr}/{tr}{$listpages[changes].useImage}{/tr}</td> {/if} + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y' } <td style="text-align:center;">{$listpages[changes].ispublished}</td> + {/if}--> + <td class="action"> + {if $tiki_p_read_article eq 'y'} <a href="{$listpages[changes].articleId|sefurl:article}" title="{$listpages[changes].title|escape}">{icon _id='magnifier' alt="{tr}View{/tr}"}</a> {/if} - {if $tiki_p_edit_article eq 'y' or ($listpages[changes].author eq $user and $listpages[changes].creator_edit eq 'y')} + + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} + {if $tiki_p_edit_article eq 'y'} <a class="link" href="tiki-edit_article.php?articleId={$listpages[changes].articleId}">{icon _id='page_edit'}</a> {/if} - {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} - <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> {/if} + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} {if $tiki_p_remove_article eq 'y'} <a class="link" href="tiki-list_articles.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> {/if} + {/if} + {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} + <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> + {/if} + {/if} </td> + + {if ($listpages[changes].authorName|escape eq $user or $tiki_p_approve_submission eq 'y' )and $listpages[changes].ispublished eq 'n' } + <td> Not publised </td> + {/if} </tr> {sectionelse} {norecords _colspan=$numbercol} @@ -178,10 +197,12 @@ <p align="left"> {*on the left to have it close to the checkboxes*} {button _text="{tr}Select Duplicates{/tr}" _onclick="checkDuplicateRows(this,'td:not(:eq(2))'); return false;"} <label>{tr}Perform action with checked:{/tr} + {if $tiki_p_approve_submission eq 'y'} <select name="submit_mult"> <option value=""></option> <option value="remove_articles" >{tr}Remove{/tr}</option> </select> + {/if} </label> <input type="submit" value="{tr}OK{/tr}" /> </p> Modified: branches/9.x/templates/tiki-view_articles.tpl =================================================================== --- branches/9.x/templates/tiki-view_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) +++ branches/9.x/templates/tiki-view_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) @@ -6,6 +6,7 @@ {else}{tr}Articles{/tr}{/if} {/title} {/if} +{/if} <div class="clearfix" style="clear: both;"> <div style="float: right; padding-left:10px; white-space: nowrap"> {if $user and $prefs.feature_user_watches eq 'y'} @@ -20,7 +21,6 @@ {/if} </div> </div> -{/if} {section name=ix loop=$listpages} {capture name=href}{if empty($urlparam)}{$listpages[ix].articleId|sefurl:article}{else}{$listpages[ix].articleId|sefurl:article:with_next}{$urlparam}{/if}{/capture} {if $listpages[ix].disp_article eq 'y'} @@ -43,13 +43,13 @@ or ($listpages[ix].show_reads eq 'y')} <span class="titleb"> {if $listpages[ix].show_author eq 'y'} - <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} - </span> + <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} </span> {/if} {if $listpages[ix].show_pubdate eq 'y'} - <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} - </span> + <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} </span> {/if} {if $listpages[ix].show_expdate eq 'y'} - <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} - </span> + <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} </span> {/if} {if $listpages[ix].show_reads eq 'y'} <span class="reads">({$listpages[ix].nbreads} {tr}Reads{/tr})</span> @@ -156,9 +156,11 @@ {/if} {if !isset($actions) or $actions eq "y"} <div class="actions"> + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} {if $tiki_p_edit_article eq 'y' or ($listpages[ix].author eq $user and $listpages[ix].creator_edit eq 'y')} <a class="icon" href="tiki-edit_article.php?articleId={$listpages[ix].articleId}">{icon _id='page_edit'}</a> {/if} + {/if} {if $prefs.feature_cms_print eq 'y'} <a class="icon" href="tiki-print_article.php?articleId={$listpages[ix].articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> {/if} @@ -167,9 +169,11 @@ {include file='translated-lang.tpl' object_type='article' trads=$listpages[ix].translations articleId=$listpages[ix].articleId} </div> {/if} + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} {if $tiki_p_remove_article eq 'y'} <a class="icon" href="tiki-list_articles.php?remove={$listpages[ix].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> {/if} + {/if} </div> {/if} </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: luciash <lu...@ti...> - 2012-11-06 02:53:39
|
wth ? why you do so many unrelated changes there ? why replace https: links back to http: ??? why replace clearfix class ??? luci On 11/06/2012 03:41 AM, lu...@us... wrote: > Revision: 43795 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43795&view=rev > Author: luatdo > Date: 2012-11-06 02:41:48 +0000 (Tue, 06 Nov 2012) > Log Message: > ----------- > because of system submission is wrong.now I use article place submission.we hide check box published,and can't view if not published. > > Modified Paths: > -------------- > branches/9.x/templates/article.tpl > branches/9.x/templates/article_trailer.tpl > branches/9.x/templates/tiki-list_articles.tpl > branches/9.x/templates/tiki-view_articles.tpl > > Modified: branches/9.x/templates/article.tpl > =================================================================== > --- branches/9.x/templates/article.tpl 2012-11-05 20:28:52 UTC (rev 43794) > +++ branches/9.x/templates/article.tpl 2012-11-06 02:41:48 UTC (rev 43795) > @@ -11,9 +11,9 @@ > {/if} > > <span class="titleb"> > - {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} - {/if} > - {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} - {/if} > - {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} - {/if} > + {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} {/if} > + {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} {/if} > + {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} {/if} > {if $show_reads eq 'y'}({$reads} {tr}Reads{/tr}){/if} > </span> > <br /> > > Modified: branches/9.x/templates/article_trailer.tpl > =================================================================== > --- branches/9.x/templates/article_trailer.tpl 2012-11-05 20:28:52 UTC (rev 43794) > +++ branches/9.x/templates/article_trailer.tpl 2012-11-06 02:41:48 UTC (rev 43795) > @@ -1,5 +1,5 @@ > {if !isset($preview)} > - <div class="clearfix articletrailer"> > + <div class="articletrailer"> > <span> > {if $show_size eq 'y'} > ({$size} {tr}bytes{/tr}) > @@ -11,9 +11,11 @@ > {include file='translated-lang.tpl' object_type='article'} > </div> > {/if} > + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > {if $tiki_p_edit_article eq 'y'} > <a class="icon" href="tiki-edit_article.php?articleId={$articleId}">{icon _id='page_edit'}</a> > {/if} > + {/if} > {if $prefs.feature_cms_print eq 'y'} > <a class="icon" href="tiki-print_article.php?articleId={$articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> > {/if} > @@ -30,16 +32,19 @@ > }, > {button:false}); > //Output your customized button > - document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="https://ws.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); > + document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); > //Tie customized button to ShareThis button functionality. > var element{/literal}{$articleId}{literal} = document.getElementById("share{/literal}{$articleId}{literal}"); object{/literal}{$articleId}{literal}.attachButton(element{/literal}{$articleId}{literal}); </script>{/literal} > {/if} > {if $prefs.feature_tell_a_friend eq 'y' && $tiki_p_tell_a_friend eq 'y'} > <a title="{tr}Send a link{/tr}" href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{icon _id='email_link' alt="{tr}Send a link{/tr}"}</a> > {/if} > + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > {if $tiki_p_remove_article eq 'y'} > <a class="icon" href="tiki-list_articles.php?remove={$articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> > {/if} > + {/if} > </div> > </div> > -{/if} > + <br class="clear" /> > +{/if} > \ No newline at end of file > > Modified: branches/9.x/templates/tiki-list_articles.tpl > =================================================================== > --- branches/9.x/templates/tiki-list_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) > +++ branches/9.x/templates/tiki-list_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) > @@ -91,15 +91,20 @@ > {assign var=numbercol value=$numbercol+1} > <th>{tr}Image{/tr}</th> > {/if} > - <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> > + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y'} > + <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> > + {/if}--> > + > {if $tiki_p_edit_article eq 'y' or $tiki_p_remove_article eq 'y' or isset($oneEditPage) or $tiki_p_read_article} > {assign var=numbercol value=$numbercol+1} > - <th>{tr}Actions{/tr}</th> > + <th>{tr}Actions{/tr} </th> > {/if} > + > </tr> > {cycle values="odd,even" print=false} > {section name=changes loop=$listpages} > <tr class="{cycle}"> > + {if $listpages[changes].ispublished eq 'y' or $tiki_p_approve_submission eq 'y' or ($listpages[changes].ispublished eq 'n' and $listpages[changes].authorName|escape eq $user) } > <td class="checkbox"> > <input type="checkbox" name="checked[]" value="{$listpages[changes].articleId|escape}" {if $listpages[changes].checked eq 'y'}checked="checked" {/if}/> > </td> > @@ -151,22 +156,36 @@ > {if $prefs.art_list_img eq 'y'} > <td class="text">{tr}{$listpages[changes].hasImage}{/tr}/{tr}{$listpages[changes].useImage}{/tr}</td> > {/if} > + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y' } > <td style="text-align:center;">{$listpages[changes].ispublished}</td> > + {/if}--> > + > <td class="action"> > + > {if $tiki_p_read_article eq 'y'} > <a href="{$listpages[changes].articleId|sefurl:article}" title="{$listpages[changes].title|escape}">{icon _id='magnifier' alt="{tr}View{/tr}"}</a> > {/if} > - {if $tiki_p_edit_article eq 'y' or ($listpages[changes].author eq $user and $listpages[changes].creator_edit eq 'y')} > + > + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > + {if $tiki_p_edit_article eq 'y'} > <a class="link" href="tiki-edit_article.php?articleId={$listpages[changes].articleId}">{icon _id='page_edit'}</a> > {/if} > - {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} > - <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> > {/if} > + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > {if $tiki_p_remove_article eq 'y'} > > <a class="link" href="tiki-list_articles.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> > {/if} > + {/if} > + {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} > + <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> > + {/if} > + {/if} > </td> > + > + {if ($listpages[changes].authorName|escape eq $user or $tiki_p_approve_submission eq 'y' )and $listpages[changes].ispublished eq 'n' } > + <td> Not publised </td> > + {/if} > </tr> > {sectionelse} > {norecords _colspan=$numbercol} > @@ -178,10 +197,12 @@ > <p align="left"> {*on the left to have it close to the checkboxes*} > {button _text="{tr}Select Duplicates{/tr}" _onclick="checkDuplicateRows(this,'td:not(:eq(2))'); return false;"} > <label>{tr}Perform action with checked:{/tr} > + {if $tiki_p_approve_submission eq 'y'} > <select name="submit_mult"> > <option value=""></option> > <option value="remove_articles" >{tr}Remove{/tr}</option> > </select> > + {/if} > </label> > <input type="submit" value="{tr}OK{/tr}" /> > </p> > > Modified: branches/9.x/templates/tiki-view_articles.tpl > =================================================================== > --- branches/9.x/templates/tiki-view_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) > +++ branches/9.x/templates/tiki-view_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) > @@ -6,6 +6,7 @@ > {else}{tr}Articles{/tr}{/if} > {/title} > {/if} > +{/if} > <div class="clearfix" style="clear: both;"> > <div style="float: right; padding-left:10px; white-space: nowrap"> > {if $user and $prefs.feature_user_watches eq 'y'} > @@ -20,7 +21,6 @@ > {/if} > </div> > </div> > -{/if} > {section name=ix loop=$listpages} > {capture name=href}{if empty($urlparam)}{$listpages[ix].articleId|sefurl:article}{else}{$listpages[ix].articleId|sefurl:article:with_next}{$urlparam}{/if}{/capture} > {if $listpages[ix].disp_article eq 'y'} > @@ -43,13 +43,13 @@ > or ($listpages[ix].show_reads eq 'y')} > <span class="titleb"> > {if $listpages[ix].show_author eq 'y'} > - <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} - </span> > + <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} </span> > {/if} > {if $listpages[ix].show_pubdate eq 'y'} > - <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} - </span> > + <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} </span> > {/if} > {if $listpages[ix].show_expdate eq 'y'} > - <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} - </span> > + <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} </span> > {/if} > {if $listpages[ix].show_reads eq 'y'} > <span class="reads">({$listpages[ix].nbreads} {tr}Reads{/tr})</span> > @@ -156,9 +156,11 @@ > {/if} > {if !isset($actions) or $actions eq "y"} > <div class="actions"> > + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > {if $tiki_p_edit_article eq 'y' or ($listpages[ix].author eq $user and $listpages[ix].creator_edit eq 'y')} > <a class="icon" href="tiki-edit_article.php?articleId={$listpages[ix].articleId}">{icon _id='page_edit'}</a> > {/if} > + {/if} > {if $prefs.feature_cms_print eq 'y'} > <a class="icon" href="tiki-print_article.php?articleId={$listpages[ix].articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> > {/if} > @@ -167,9 +169,11 @@ > {include file='translated-lang.tpl' object_type='article' trads=$listpages[ix].translations articleId=$listpages[ix].articleId} > </div> > {/if} > + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} > {if $tiki_p_remove_article eq 'y'} > <a class="icon" href="tiki-list_articles.php?remove={$listpages[ix].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> > {/if} > + {/if} > </div> > {/if} > </div> > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > LogMeIn Central: Instant, anywhere, Remote PC access and management. > Stay in control, update software, and manage PCs from one command center > Diagnose problems and improve visibility into emerging IT issues > Automate, monitor and manage. Do more in less time with Central > http://p.sf.net/sfu/logmein12331_d2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: luciash <lu...@ti...> - 2012-11-06 04:11:29
|
Moreover this should not go to branches/9.x ... :-/ On 11/06/2012 03:53 AM, luciash wrote: > wth ? why you do so many unrelated changes there ? why replace https: > links back to http: ??? why replace clearfix class ??? > > luci > > > On 11/06/2012 03:41 AM, lu...@us... wrote: >> Revision: 43795 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43795&view=rev >> Author: luatdo >> Date: 2012-11-06 02:41:48 +0000 (Tue, 06 Nov 2012) >> Log Message: >> ----------- >> because of system submission is wrong.now I use article place submission.we hide check box published,and can't view if not published. >> >> Modified Paths: >> -------------- >> branches/9.x/templates/article.tpl >> branches/9.x/templates/article_trailer.tpl >> branches/9.x/templates/tiki-list_articles.tpl >> branches/9.x/templates/tiki-view_articles.tpl >> >> Modified: branches/9.x/templates/article.tpl >> =================================================================== >> --- branches/9.x/templates/article.tpl 2012-11-05 20:28:52 UTC (rev 43794) >> +++ branches/9.x/templates/article.tpl 2012-11-06 02:41:48 UTC (rev 43795) >> @@ -11,9 +11,9 @@ >> {/if} >> >> <span class="titleb"> >> - {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} - {/if} >> - {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} - {/if} >> - {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} - {/if} >> + {if $show_author eq 'y' && $authorName}{tr}Author:{/tr} {$authorName|escape} {/if} >> + {if $show_pubdate eq 'y' && $publishDate}{$publishDate|tiki_short_datetime:'Published At:'} {/if} >> + {if $show_expdate eq 'y' && $expireDate}{tr}Expires At:{/tr} {$expireDate|tiki_short_datetime} {/if} >> {if $show_reads eq 'y'}({$reads} {tr}Reads{/tr}){/if} >> </span> >> <br /> >> >> Modified: branches/9.x/templates/article_trailer.tpl >> =================================================================== >> --- branches/9.x/templates/article_trailer.tpl 2012-11-05 20:28:52 UTC (rev 43794) >> +++ branches/9.x/templates/article_trailer.tpl 2012-11-06 02:41:48 UTC (rev 43795) >> @@ -1,5 +1,5 @@ >> {if !isset($preview)} >> - <div class="clearfix articletrailer"> >> + <div class="articletrailer"> >> <span> >> {if $show_size eq 'y'} >> ({$size} {tr}bytes{/tr}) >> @@ -11,9 +11,11 @@ >> {include file='translated-lang.tpl' object_type='article'} >> </div> >> {/if} >> + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> {if $tiki_p_edit_article eq 'y'} >> <a class="icon" href="tiki-edit_article.php?articleId={$articleId}">{icon _id='page_edit'}</a> >> {/if} >> + {/if} >> {if $prefs.feature_cms_print eq 'y'} >> <a class="icon" href="tiki-print_article.php?articleId={$articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> >> {/if} >> @@ -30,16 +32,19 @@ >> }, >> {button:false}); >> //Output your customized button >> - document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="https://ws.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); >> + document.write('<span class="share" id="share{/literal}{$articleId}{literal}"><a title="{/literal}{$smarty.capture.shared_link_title|replace:'\'':'\\\''}{literal}" href="javascript:void(0);"><img src="http://w.sharethis.com/images/share-icon-16x16.png?CXNID=1000014.0NXC" /></a></span>'); >> //Tie customized button to ShareThis button functionality. >> var element{/literal}{$articleId}{literal} = document.getElementById("share{/literal}{$articleId}{literal}"); object{/literal}{$articleId}{literal}.attachButton(element{/literal}{$articleId}{literal}); </script>{/literal} >> {/if} >> {if $prefs.feature_tell_a_friend eq 'y' && $tiki_p_tell_a_friend eq 'y'} >> <a title="{tr}Send a link{/tr}" href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{icon _id='email_link' alt="{tr}Send a link{/tr}"}</a> >> {/if} >> + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> {if $tiki_p_remove_article eq 'y'} >> <a class="icon" href="tiki-list_articles.php?remove={$articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> >> {/if} >> + {/if} >> </div> >> </div> >> -{/if} >> + <br class="clear" /> >> +{/if} >> \ No newline at end of file >> >> Modified: branches/9.x/templates/tiki-list_articles.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-list_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) >> +++ branches/9.x/templates/tiki-list_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) >> @@ -91,15 +91,20 @@ >> {assign var=numbercol value=$numbercol+1} >> <th>{tr}Image{/tr}</th> >> {/if} >> - <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> >> + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y'} >> + <th>{self_link _sort_arg='sort_mode' _sort_field='ispublished'}{tr}Published{/tr}{/self_link}</th> >> + {/if}--> >> + >> {if $tiki_p_edit_article eq 'y' or $tiki_p_remove_article eq 'y' or isset($oneEditPage) or $tiki_p_read_article} >> {assign var=numbercol value=$numbercol+1} >> - <th>{tr}Actions{/tr}</th> >> + <th>{tr}Actions{/tr} </th> >> {/if} >> + >> </tr> >> {cycle values="odd,even" print=false} >> {section name=changes loop=$listpages} >> <tr class="{cycle}"> >> + {if $listpages[changes].ispublished eq 'y' or $tiki_p_approve_submission eq 'y' or ($listpages[changes].ispublished eq 'n' and $listpages[changes].authorName|escape eq $user) } >> <td class="checkbox"> >> <input type="checkbox" name="checked[]" value="{$listpages[changes].articleId|escape}" {if $listpages[changes].checked eq 'y'}checked="checked" {/if}/> >> </td> >> @@ -151,22 +156,36 @@ >> {if $prefs.art_list_img eq 'y'} >> <td class="text">{tr}{$listpages[changes].hasImage}{/tr}/{tr}{$listpages[changes].useImage}{/tr}</td> >> {/if} >> + <!--{if $tiki_p_admin eq 'y' or $tiki_p_admin_cms eq 'y' } >> <td style="text-align:center;">{$listpages[changes].ispublished}</td> >> + {/if}--> >> + >> <td class="action"> >> + >> {if $tiki_p_read_article eq 'y'} >> <a href="{$listpages[changes].articleId|sefurl:article}" title="{$listpages[changes].title|escape}">{icon _id='magnifier' alt="{tr}View{/tr}"}</a> >> {/if} >> - {if $tiki_p_edit_article eq 'y' or ($listpages[changes].author eq $user and $listpages[changes].creator_edit eq 'y')} >> + >> + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> + {if $tiki_p_edit_article eq 'y'} >> <a class="link" href="tiki-edit_article.php?articleId={$listpages[changes].articleId}">{icon _id='page_edit'}</a> >> {/if} >> - {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} >> - <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> >> {/if} >> + {if $listpages[changes].authorName|escape eq $user and $listpages[changes].ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> {if $tiki_p_remove_article eq 'y'} >> >> <a class="link" href="tiki-list_articles.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> >> {/if} >> + {/if} >> + {if $tiki_p_admin_cms eq 'y' or $tiki_p_assign_perm_cms eq 'y'} >> + <a class="link" href="tiki-objectpermissions.php?objectName={$listpages[changes].title|escape:'url'}&objectType=article&permType=cms&objectId={$listpages[changes].articleId}">{icon _id='key' alt="{tr}Permissons{/tr}"}</a> >> + {/if} >> + {/if} >> </td> >> + >> + {if ($listpages[changes].authorName|escape eq $user or $tiki_p_approve_submission eq 'y' )and $listpages[changes].ispublished eq 'n' } >> + <td> Not publised </td> >> + {/if} >> </tr> >> {sectionelse} >> {norecords _colspan=$numbercol} >> @@ -178,10 +197,12 @@ >> <p align="left"> {*on the left to have it close to the checkboxes*} >> {button _text="{tr}Select Duplicates{/tr}" _onclick="checkDuplicateRows(this,'td:not(:eq(2))'); return false;"} >> <label>{tr}Perform action with checked:{/tr} >> + {if $tiki_p_approve_submission eq 'y'} >> <select name="submit_mult"> >> <option value=""></option> >> <option value="remove_articles" >{tr}Remove{/tr}</option> >> </select> >> + {/if} >> </label> >> <input type="submit" value="{tr}OK{/tr}" /> >> </p> >> >> Modified: branches/9.x/templates/tiki-view_articles.tpl >> =================================================================== >> --- branches/9.x/templates/tiki-view_articles.tpl 2012-11-05 20:28:52 UTC (rev 43794) >> +++ branches/9.x/templates/tiki-view_articles.tpl 2012-11-06 02:41:48 UTC (rev 43795) >> @@ -6,6 +6,7 @@ >> {else}{tr}Articles{/tr}{/if} >> {/title} >> {/if} >> +{/if} >> <div class="clearfix" style="clear: both;"> >> <div style="float: right; padding-left:10px; white-space: nowrap"> >> {if $user and $prefs.feature_user_watches eq 'y'} >> @@ -20,7 +21,6 @@ >> {/if} >> </div> >> </div> >> -{/if} >> {section name=ix loop=$listpages} >> {capture name=href}{if empty($urlparam)}{$listpages[ix].articleId|sefurl:article}{else}{$listpages[ix].articleId|sefurl:article:with_next}{$urlparam}{/if}{/capture} >> {if $listpages[ix].disp_article eq 'y'} >> @@ -43,13 +43,13 @@ >> or ($listpages[ix].show_reads eq 'y')} >> <span class="titleb"> >> {if $listpages[ix].show_author eq 'y'} >> - <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} - </span> >> + <span class="author">{tr}Author:{/tr} {$listpages[ix].authorName|escape} </span> >> {/if} >> {if $listpages[ix].show_pubdate eq 'y'} >> - <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} - </span> >> + <span class="pubdate">{tr}Published At:{/tr} {$listpages[ix].publishDate|tiki_short_datetime} </span> >> {/if} >> {if $listpages[ix].show_expdate eq 'y'} >> - <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} - </span> >> + <span class="expdate">{tr}Expires At:{/tr} {$listpages[ix].expireDate|tiki_short_datetime} </span> >> {/if} >> {if $listpages[ix].show_reads eq 'y'} >> <span class="reads">({$listpages[ix].nbreads} {tr}Reads{/tr})</span> >> @@ -156,9 +156,11 @@ >> {/if} >> {if !isset($actions) or $actions eq "y"} >> <div class="actions"> >> + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> {if $tiki_p_edit_article eq 'y' or ($listpages[ix].author eq $user and $listpages[ix].creator_edit eq 'y')} >> <a class="icon" href="tiki-edit_article.php?articleId={$listpages[ix].articleId}">{icon _id='page_edit'}</a> >> {/if} >> + {/if} >> {if $prefs.feature_cms_print eq 'y'} >> <a class="icon" href="tiki-print_article.php?articleId={$listpages[ix].articleId}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> >> {/if} >> @@ -167,9 +169,11 @@ >> {include file='translated-lang.tpl' object_type='article' trads=$listpages[ix].translations articleId=$listpages[ix].articleId} >> </div> >> {/if} >> + {if $authorName|escape eq $user and $ispublished eq 'n' or $tiki_p_approve_submission eq 'y'} >> {if $tiki_p_remove_article eq 'y'} >> <a class="icon" href="tiki-list_articles.php?remove={$listpages[ix].articleId}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> >> {/if} >> + {/if} >> </div> >> {/if} >> </div> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> >> ------------------------------------------------------------------------------ >> LogMeIn Central: Instant, anywhere, Remote PC access and management. >> Stay in control, update software, and manage PCs from one command center >> Diagnose problems and improve visibility into emerging IT issues >> Automate, monitor and manage. Do more in less time with Central >> http://p.sf.net/sfu/logmein12331_d2d >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------------ > LogMeIn Central: Instant, anywhere, Remote PC access and management. > Stay in control, update software, and manage PCs from one command center > Diagnose problems and improve visibility into emerging IT issues > Automate, monitor and manage. Do more in less time with Central > http://p.sf.net/sfu/logmein12331_d2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |