Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv925/templates Modified Files: Tag: BRANCH-1-8 tiki-admin_forums.tpl tiki-admin_surveys.tpl tiki-admin_trackers.tpl tiki-admingroups.tpl tiki-adminusers.tpl tiki-assignpermission.tpl tiki-assignuser.tpl tiki-edit_image.tpl tiki-file_galleries.tpl tiki-galleries.tpl tiki-list_blogs.tpl tiki-objectpermissions.tpl tiki-pagepermissions.tpl Log Message: * Changed some class 'link' into 'linkbut' where appropriate * Changed way individual object permissions are shown. Now using a different icon (key_active.gif) instead of ()'s * Changed position of some actions icons to make order more standard (config, edit/delete, perms) * Added some nowraps to icon action columns * Added 'go back' facility when editing an image * Cosmetic fixes Index: tiki-admin_forums.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_forums.tpl,v retrieving revision 1.25.2.10 retrieving revision 1.25.2.11 diff -u -d -r1.25.2.10 -r1.25.2.11 --- tiki-admin_forums.tpl 30 Mar 2004 18:46:20 -0000 1.25.2.10 +++ tiki-admin_forums.tpl 20 May 2004 15:30:57 -0000 1.25.2.11 @@ -300,9 +300,12 @@ <td class="{cycle advance=false}"> {if ($tiki_p_admin eq 'y') or (($channels[user].individual eq 'n') and ($tiki_p_admin_forum eq 'y')) or ($channels[user].individual_tiki_p_admin_forum eq 'y')} <a class="link" href="tiki-admin_forums.php?offset={$offset}&sort_mode={$sort_mode}&forumId={$channels[user].forumId}"><img border="0" alt="{tr}Configure/Options{/tr}" src="img/icons/config.gif" /></a> - <a class="link" href="tiki-objectpermissions.php?objectName={tr}Forum{/tr}%20{$channels[user].name}&objectType=forum&permType=forums&objectId={$channels[user].forumId}"><img border="0" alt="{tr}Assign Permissions{/tr}" src="img/icons/key.gif" /></a> - <a class="link" href="tiki-admin_forums.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].forumId}" -title="{tr}Click here to delete this forum{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> + <a class="link" href="tiki-admin_forums.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].forumId}" title="{tr}Click here to delete this forum{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> + {if $channels[user].individual eq 'y'} + <a class="link" href="tiki-objectpermissions.php?objectName={tr}Forum{/tr}%20{$channels[user].name}&objectType=forum&permType=forums&objectId={$channels[user].forumId}"><img border="0" alt="{tr}Assign Permissions (Active){/tr}" src="img/icons/key_active.gif" /></a> + {else} + <a class="link" href="tiki-objectpermissions.php?objectName={tr}Forum{/tr}%20{$channels[user].name}&objectType=forum&permType=forums&objectId={$channels[user].forumId}"><img border="0" alt="{tr}Assign Permissions{/tr}" src="img/icons/key.gif" /></a> + {/if} {/if} </td> </tr> Index: tiki-admin_surveys.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_surveys.tpl,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -u -d -r1.9.2.1 -r1.9.2.2 --- tiki-admin_surveys.tpl 8 Dec 2003 12:06:58 -0000 1.9.2.1 +++ tiki-admin_surveys.tpl 20 May 2004 15:30:58 -0000 1.9.2.2 @@ -14,14 +14,6 @@ <!-- beginning of next bit --> - - - - - - - - <br /><br /> <a class="linkbut" href="tiki-list_surveys.php">{tr}list surveys{/tr}</a> <a class="linkbut" href="tiki-survey_stats.php">{tr}survey stats{/tr}</a> @@ -89,8 +81,12 @@ <td class="{cycle}"> <a class="link" href="tiki-admin_surveys.php?offset={$offset}&sort_mode={$sort_mode}&surveyId={$channels[user].surveyId}"><img src='img/icons/config.gif' border='0' alt='{tr}edit{/tr}' title='{tr}edit{/tr}' /></a> <a class="link" href="tiki-admin_survey_questions.php?surveyId={$channels[user].surveyId}"><img src='img/icons/question.gif' alt='{tr}question{/tr}' border='0' title='{tr}questions{/tr}' /></a> - {if $channels[user].individual eq 'y'}({/if}<a class="link" href="tiki-objectpermissions.php?objectName=Survey%20{$channels[user].name}&objectType=survey&permType=surveys&objectId={$channels[user].surveyId}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' border='0' title='{tr}perms{/tr}' /></a>{if $channels[user].individual eq 'y'}){/if} <a class="link" href="tiki-admin_surveys.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].surveyId}"><img src='img/icons2/delete.gif' alt='{tr}remove{/tr}' title='{tr}remove{/tr}' border='0' /></a> + {if $channels[user].individual eq 'y'} + <a class="link" href="tiki-objectpermissions.php?objectName=Survey%20{$channels[user].name}&objectType=survey&permType=surveys&objectId={$channels[user].surveyId}"><img src='img/icons/key_active.gif' alt='{tr}active perms{/tr}' border='0' title='{tr}active perms{/tr}' /></a> + {else} + <a class="link" href="tiki-objectpermissions.php?objectName=Survey%20{$channels[user].name}&objectType=survey&permType=surveys&objectId={$channels[user].surveyId}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' border='0' title='{tr}perms{/tr}' /></a> + {/if} </td> </tr> {/section} Index: tiki-admin_trackers.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_trackers.tpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -d -r1.14.2.1 -r1.14.2.2 --- tiki-admin_trackers.tpl 8 Dec 2003 12:06:58 -0000 1.14.2.1 +++ tiki-admin_trackers.tpl 20 May 2004 15:30:58 -0000 1.14.2.2 @@ -13,7 +13,6 @@ <!-- beginning of next bit --> - <br /><br /> <a href="tiki-list_trackers.php" class="linkbut">{tr}List trackers{/tr}</a> {if $tiki_p_admin_trackers eq 'y'} @@ -74,8 +73,12 @@ <td class="{cycle}"> <a class="link" href="tiki-admin_trackers.php?offset={$offset}&sort_mode={$sort_mode}&trackerId={$channels[user].trackerId}"><img src='img/icons/edit.gif' alt='{tr}edit{/tr}' title='{tr}edit{/tr}' border='0' /></a> <a class="link" href="tiki-admin_tracker_fields.php?trackerId={$channels[user].trackerId}"><img src='img/icons/ico_table.gif' alt='{tr}fields{/tr}' title='{tr}fields{/tr}' border='0' /></a> - {if $channels[user].individual eq 'y'}({/if}<a class="link" href="tiki-objectpermissions.php?objectName=Tracker%20{$channels[user].name}&objectType=tracker&permType=trackers&objectId={$channels[user].trackerId}"><img src='img/icons/key.gif' border='0' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' /></a>{if $channels[user].individual eq 'y'}){/if} <a class="link" href="tiki-admin_trackers.php?offset={$offset}&sort_mode={$sort_mode}&remove={$channels[user].trackerId}"><img src='img/icons2/delete.gif' alt='{tr}remove{/tr}' title='{tr}remove{/tr}' border='0' /></a> + {if $channels[user].individual eq 'y'} + <a class="link" href="tiki-objectpermissions.php?objectName=Tracker%20{$channels[user].name}&objectType=tracker&permType=trackers&objectId={$channels[user].trackerId}"><img src='img/icons/key_active.gif' border='0' alt='{tr}active perms{/tr}' title='{tr}active perms{/tr}' /></a> + {else} + <a class="link" href="tiki-objectpermissions.php?objectName=Tracker%20{$channels[user].name}&objectType=tracker&permType=trackers&objectId={$channels[user].trackerId}"><img src='img/icons/key.gif' border='0' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' /></a> + {/if} </td> </tr> {/section} Index: tiki-admingroups.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admingroups.tpl,v retrieving revision 1.17.4.10 retrieving revision 1.17.4.11 diff -u -d -r1.17.4.10 -r1.17.4.11 --- tiki-admingroups.tpl 30 Mar 2004 18:46:20 -0000 1.17.4.10 +++ tiki-admingroups.tpl 20 May 2004 15:30:58 -0000 1.17.4.11 @@ -77,11 +77,14 @@ {/section} </td> <td class="{cycle}"> -<a class="link" href="tiki-assignpermission.php?group={$users[user].groupName}" title="{tr}perms{/tr}"><img border="0" alt="{tr}Assign Permissions{/tr}" src="img/icons/key.gif" /></a> <a class="link" href="tiki-admingroups.php?group={$users[user].groupName}" title="{tr}edit{/tr}"><img border="0" alt="{tr}Edit{/tr}" src="img/icons/edit.gif" /></a> {if $users[user].groupName !== 'Anonymous'} - <a class="link" href="tiki-admingroups.php?offset={$offset}&sort_mode={$sort_mode}&action=delete&group={$users[user].groupName}" -title="{tr}delete{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> + <a class="link" href="tiki-admingroups.php?offset={$offset}&sort_mode={$sort_mode}&action=delete&group={$users[user].groupName}" title="{tr}delete{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> +{/if} +{if !empty($users[user].perms) } + <a class="link" href="tiki-assignpermission.php?group={$users[user].groupName}" title="{tr}active perms{/tr}"><img border="0" alt="{tr}Assign Permissions (Active){/tr}" src="img/icons/key_active.gif" /></a> +{else} + <a class="link" href="tiki-assignpermission.php?group={$users[user].groupName}" title="{tr}perms{/tr}"><img border="0" alt="{tr}Assign Permissions{/tr}" src="img/icons/key.gif" /></a> {/if} </td> </tr> Index: tiki-adminusers.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-adminusers.tpl,v retrieving revision 1.26.2.7 retrieving revision 1.26.2.8 diff -u -d -r1.26.2.7 -r1.26.2.8 --- tiki-adminusers.tpl 17 Mar 2004 13:33:45 -0000 1.26.2.7 +++ tiki-adminusers.tpl 20 May 2004 15:30:58 -0000 1.26.2.8 @@ -30,7 +30,7 @@ </form> <br /> <table class="normal"> -<tr><td class="formcolor"><a class="link" href="javascript:genPass('genepass','pass','pass2');">{tr}Generate a password{/tr}</a></td> +<tr><td class="formcolor"><a class="linkbut" href="javascript:genPass('genepass','pass','pass2');">{tr}Generate a password{/tr}</a></td> <td class="formcolor"><input id='genepass' type="text" /></td></tr> </table> <br /> @@ -78,15 +78,24 @@ <td class="{cycle advance=false}">{$users[user].email}</td> <td class="{cycle advance=false}">{if $users[user].currentLogin eq ''}{tr}Never{/tr}{else}{$users[user].currentLogin|dbg|tiki_long_datetime}{/if}</td> <td class="{cycle advance=false}"> +{counter start=0 print=false assign=anoncount} {foreach from=$users[user].groups item=grs} {$grs} +{counter} {if $grs != "Anonymous"} (<a class="link" href="tiki-adminusers.php?offset={$offset}&numrows={$numrows}&sort_mode={$sort_mode}&user={$users[user].user}&action=removegroup&group={$grs}">x</a>) {/if} {/foreach} -<td class="{cycle}" nowrap="nowrap">{if $users[user].user ne 'admin'} <a class="link" href="tiki-adminusers.php?offset={$offset}&numrows={$numrows}&sort_mode={$sort_mode}&action=delete&user={$users[user].user}" title="{tr}Remove{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> {/if} -<a class="link" href="tiki-assignuser.php?assign_user={$users[user].user}" title="{tr}Assign Group{/tr}"><img border="0" alt="{tr}Assign Group{/tr}" src="img/icons/key.gif" /></a> +<td class="{cycle}" nowrap="nowrap"> <a class="link" href="tiki-user_preferences.php?view_user={$users[user].user}" title="{tr}Configure/Options{/tr}"><img border="0" alt="{tr}Configure/Options{/tr}" src="img/icons/config.gif" /></a> +{if $users[user].user ne 'admin'} + <a class="link" href="tiki-adminusers.php?offset={$offset}&numrows={$numrows}&sort_mode={$sort_mode}&action=delete&user={$users[user].user}" title="{tr}Remove{/tr}"><img border="0" alt="{tr}Remove{/tr}" src="img/icons2/delete.gif" /></a> +{/if} +{if $anoncount ne '1' } + <a class="link" href="tiki-assignuser.php?assign_user={$users[user].user}" title="{tr}Assign Group (Active){/tr}"><img border="0" alt="{tr}Assign Group (Active){/tr}" src="img/icons/key_active.gif" /></a> +{else} + <a class="link" href="tiki-assignuser.php?assign_user={$users[user].user}" title="{tr}Assign Group{/tr}"><img border="0" alt="{tr}Assign Group{/tr}" src="img/icons/key.gif" /></a> +{/if} </td> </tr> {/section} Index: tiki-assignpermission.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-assignpermission.tpl,v retrieving revision 1.37.4.2 retrieving revision 1.37.4.3 diff -u -d -r1.37.4.2 -r1.37.4.3 --- tiki-assignpermission.tpl 1 Feb 2004 12:56:06 -0000 1.37.4.2 +++ tiki-assignpermission.tpl 20 May 2004 15:30:58 -0000 1.37.4.3 @@ -14,7 +14,7 @@ {/if} <br/><br/> -<a href="tiki-admingroups.php" class="link">{tr}Back to groups{/tr}</a><br/> +<a href="tiki-admingroups.php" class="linkbut">{tr}Back to groups{/tr}</a><br/> <h3>{tr}Group Information{/tr}</h3> <table class="normal"> <tr><td class="even">{tr}Name{/tr}:</td><td class="odd">{$group_info.groupName}</td></tr> Index: tiki-assignuser.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-assignuser.tpl,v retrieving revision 1.10.4.1 retrieving revision 1.10.4.2 diff -u -d -r1.10.4.1 -r1.10.4.2 --- tiki-assignuser.tpl 17 Mar 2004 13:49:53 -0000 1.10.4.1 +++ tiki-assignuser.tpl 20 May 2004 15:30:58 -0000 1.10.4.2 @@ -1,7 +1,7 @@ {* $Header$ *} <a href="tiki-assignuser.php?assign_user={$assign_user}" class="pagetitle">{tr}Assign user{/tr} {$assign_user} {tr}to groups{/tr}</a><br/><br/> -<a href="tiki-adminusers.php" class="link">Back to users</a> +<a href="tiki-adminusers.php" class="linkbut">Back to users</a> <br/> <h3>{tr}User Information{/tr}</h3> <table class="normal"> Index: tiki-edit_image.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-edit_image.tpl,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -d -r1.5.4.1 -r1.5.4.2 --- tiki-edit_image.tpl 27 Apr 2004 11:41:17 -0000 1.5.4.1 +++ tiki-edit_image.tpl 20 May 2004 15:30:58 -0000 1.5.4.2 @@ -1,4 +1,7 @@ <a href="tiki-edit_image.php?galleryId={$galleryId}&edit={$imageId}" class="pagetitle">{tr}Edit Image{/tr}</a><br /><br /> +<a class="linkbut" href="tiki-browse_gallery.php?galleryId={$galleryId}">{tr}return to gallery{/tr}</a> +<a class="linkbut" href="tiki-browse_image.php?imageId={$imageId}">{tr}browse image{/tr}</a> +<br /><br /> <div align="center"> {if $show eq 'y'} <br /> @@ -20,8 +23,20 @@ </table> </form> <br /> -<div class="linksinfo"> -{tr}You can view this image in your browser using{/tr}: <a class="gallink" href="{$url_browse}?imageId={$imageId}">{$url_browse}?imageId={$imageId}</a><br /> -{tr}You can include the image in an HTML or Tiki page using{/tr} <img src="{$url_show}?id={$imageId}" /> -</div> +<table class="normal"> +<tr> + <td class="even"> + <small> + {tr}You can view this image in your browser using{/tr}: <a class="gallink" href="{$url_browse}?imageId={$imageId}">{$url_browse}?imageId={$imageId}</a><br/> + </small> + </td> +</tr> +<tr> + <td class="even"> + <small> + {tr}You can include the image in an HTML or Tiki page using{/tr} <img src="{$url_show}?id={$imageId}" /> + </small> + </td> +</tr> +</table> </div> Index: tiki-file_galleries.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-file_galleries.tpl,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -d -r1.23 -r1.23.2.1 --- tiki-file_galleries.tpl 15 Nov 2003 12:12:32 -0000 1.23 +++ tiki-file_galleries.tpl 20 May 2004 15:30:58 -0000 1.23.2.1 @@ -179,7 +179,7 @@ {/if} - <td class="{cycle}"> + <td class="{cycle}" nowrap="nowrap"> {if $tiki_p_admin_file_galleries eq 'y' or ($user and $galleries[changes].user eq $user)} {if ($tiki_p_admin eq 'y') or ($galleries[changes].individual eq 'n') or ($galleries[changes].individual_tiki_p_create_file_galleries eq 'y' ) } <a class="fgallink" href="tiki-file_galleries.php?offset={$offset}&sort_mode={$sort_mode}&edit_mode=1&galleryId={$galleries[changes].id}"><img src='img/icons/config.gif' border='0' alt='{tr}edit{/tr}' title='{tr}edit{/tr}' /></a> @@ -196,7 +196,11 @@ {/if} {if $tiki_p_admin eq 'y'} - {if $galleries[changes].individual eq 'y'}({/if}<a class="fgallink" href="tiki-objectpermissions.php?objectName=file%20gallery%20{$galleries[changes].name}&objectType=file%20gallery&permType=file%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' border='0' /></a>{if $galleries[changes].individual eq 'y'}){/if} + {if $galleries[changes].individual eq 'y'} + <a class="fgallink" href="tiki-objectpermissions.php?objectName=file%20gallery%20{$galleries[changes].name}&objectType=file%20gallery&permType=file%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key_active.gif' alt='{tr}active perms{/tr}' title='{tr}active perms{/tr}' border='0' /></a> + {else} + <a class="fgallink" href="tiki-objectpermissions.php?objectName=file%20gallery%20{$galleries[changes].name}&objectType=file%20gallery&permType=file%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' border='0' /></a> + {/if} {/if} </td> Index: tiki-galleries.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-galleries.tpl,v retrieving revision 1.25.2.1 retrieving revision 1.25.2.2 diff -u -d -r1.25.2.1 -r1.25.2.2 --- tiki-galleries.tpl 5 May 2004 11:43:30 -0000 1.25.2.1 +++ tiki-galleries.tpl 20 May 2004 15:30:58 -0000 1.25.2.2 @@ -137,7 +137,7 @@ {if $gal_list_visits eq 'y'} <td style="text-align:right;" class="{cycle advance=false}">{$galleries[changes].hits}</td> {/if} - <td class="{cycle}"> + <td class="{cycle}" nowrap="nowrap"> {if $tiki_p_admin_galleries eq 'y' or ($user and $galleries[changes].user eq $user)} {if ($tiki_p_admin eq 'y') or ($galleries[changes].individual eq 'n') or ($galleries[changes].individual_tiki_p_create_galleries eq 'y' ) } <a class="gallink" href="tiki-galleries.php?offset={$offset}&sort_mode={$sort_mode}&edit_mode=1&galleryId={$galleries[changes].id}"><img src='img/icons/config.gif' alt='{tr}Edit{/tr}' title='{tr}Edit{/tr}' height="16" width="16" border='0' /></a> @@ -155,7 +155,11 @@ <a class="gallink" href="tiki-list_gallery.php?galleryId={$galleries[changes].id}"><img border='0' height="16" width="18" src='img/icons/ico_table.gif' title='{tr}List{/tr}' alt='{tr}List{/tr}' /></a> {/if} {if $tiki_p_admin eq 'y'} - {if $galleries[changes].individual eq 'y'}({/if}<a class="gallink" href="tiki-objectpermissions.php?objectName=gallery%20{$galleries[changes].name}&objectType=image%20gallery&permType=image%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' height="16" width="17" border='0' /></a>{if $galleries[changes].individual eq 'y'}){/if} + {if $galleries[changes].individual eq 'y'} + <a class="gallink" href="tiki-objectpermissions.php?objectName=gallery%20{$galleries[changes].name}&objectType=image%20gallery&permType=image%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key_active.gif' alt='{tr}active perms{/tr}' title='{tr}active perms{/tr}' height="16" width="17" border='0' /></a> + {else} + <a class="gallink" href="tiki-objectpermissions.php?objectName=gallery%20{$galleries[changes].name}&objectType=image%20gallery&permType=image%20galleries&objectId={$galleries[changes].id}"><img src='img/icons/key.gif' alt='{tr}perms{/tr}' title='{tr}perms{/tr}' height="16" width="17" border='0' /></a> + {/if} {/if} </td> </tr> Index: tiki-list_blogs.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-list_blogs.tpl,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -d -r1.21.2.1 -r1.21.2.2 --- tiki-list_blogs.tpl 16 Mar 2004 01:58:20 -0000 1.21.2.1 +++ tiki-list_blogs.tpl 20 May 2004 15:30:58 -0000 1.21.2.2 @@ -79,7 +79,12 @@ {if $blog_list_activity eq 'y'} <td style="text-align:right;" class="bloglistactivity{cycle advance=false}"> {$listpages[changes].activity} </td> {/if} -<td class="bloglistactions{cycle}"> +<td class="bloglistactions{cycle}" nowrap="nowrap"> + {if ($user and $listpages[changes].user eq $user) or ($tiki_p_blog_admin eq 'y')} + {if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_blog_create_blog eq 'y' ) } + <a class="bloglink" href="tiki-edit_blog.php?blogId={$listpages[changes].blogId}"><img border='0' title='{tr}edit{/tr}' alt='{tr}edit{/tr}' src='img/icons/config.gif' /></a> + {/if} + {/if} {if $tiki_p_blog_post eq 'y'} {if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_blog_post eq 'y' ) } {if ($user and $listpages[changes].user eq $user) or ($tiki_p_blog_admin eq 'y') or ($listpages[changes].public eq 'y')} @@ -89,16 +94,15 @@ {/if} {if ($user and $listpages[changes].user eq $user) or ($tiki_p_blog_admin eq 'y')} {if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_blog_create_blog eq 'y' ) } - <a class="bloglink" href="tiki-edit_blog.php?blogId={$listpages[changes].blogId}"><img border='0' title='{tr}edit{/tr}' alt='{tr}edit{/tr}' src='img/icons/config.gif' /></a> - {/if} - {/if} - {if ($user and $listpages[changes].user eq $user) or ($tiki_p_blog_admin eq 'y')} - {if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_blog_create_blog eq 'y' ) } <a class="bloglink" href="tiki-list_blogs.php?offset={$offset}&sort_mode={$sort_mode}&remove={$listpages[changes].blogId}"><img border='0' title='{tr}remove{/tr}' alt='{tr}remove{/tr}' src='img/icons2/delete.gif' /></a> {/if} {/if} {if $tiki_p_admin eq 'y'} - {if $listpages[changes].individual eq 'y'}({/if}<a class="bloglink" href="tiki-objectpermissions.php?objectName=blog%20{$listpages[changes].title}&objectType=blog&permType=blogs&objectId={$listpages[changes].blogId}"><img border='0' title='{tr}perms{/tr}' alt='{tr}perms{/tr}' src='img/icons/key.gif' /></a>{if $listpages[changes].individual eq 'y'}){/if} + {if $listpages[changes].individual eq 'y'} + <a class="bloglink" href="tiki-objectpermissions.php?objectName=blog%20{$listpages[changes].title}&objectType=blog&permType=blogs&objectId={$listpages[changes].blogId}"><img border='0' title='{tr}active perms{/tr}' alt='{tr}active perms{/tr}' src='img/icons/key_active.gif' /></a> + {else} + <a class="bloglink" href="tiki-objectpermissions.php?objectName=blog%20{$listpages[changes].title}&objectType=blog&permType=blogs&objectId={$listpages[changes].blogId}"><img border='0' title='{tr}perms{/tr}' alt='{tr}perms{/tr}' src='img/icons/key.gif' /></a> + {/if} {/if} </td> Index: tiki-objectpermissions.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-objectpermissions.tpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -d -r1.7 -r1.7.2.1 --- tiki-objectpermissions.tpl 24 Nov 2003 00:39:19 -0000 1.7 +++ tiki-objectpermissions.tpl 20 May 2004 15:30:58 -0000 1.7.2.1 @@ -1,5 +1,5 @@ <h2>{tr}Assign permissions to {/tr}{$objectName}</h2> -<a href="{$referer}" class="link">{tr}back{/tr}</a> +<a href="{$referer}" class="linkbut">{tr}back{/tr}</a> <div> <h3>{tr}Current permissions for this object{/tr}:</h3> <table class="normal"> Index: tiki-pagepermissions.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-pagepermissions.tpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -d -r1.11 -r1.11.2.1 --- tiki-pagepermissions.tpl 5 Dec 2003 11:51:39 -0000 1.11 +++ tiki-pagepermissions.tpl 20 May 2004 15:30:59 -0000 1.11.2.1 @@ -1,6 +1,6 @@ {* $Header$ *} -<h2>{tr}Assign permissions to page{/tr}: {$page}</h2> +<h2>{tr}Assign permissions to page{/tr}: <a href="tiki-index.php?page={$page}">{$page}</a></h2> <h3>{tr}Current permissions for this page{/tr}:</h3> <table class="normal"> <tr><td class="heading">{tr}group{/tr}</td><td class="heading">{tr}permission{/tr}</td><td class="heading">{tr}action{/tr}</td></tr> |