[Tikiwiki-cvs] tiki/templates tiki-page_bar.tpl, 1.82.2.4, 1.82.2.5 tiki-p_share_page.tpl, 1.2.2.1, 1.2.2.2

[<pk...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28841/d

Modified Files:
      Tag: BRANCH-1-10
	tiki-page_bar.tpl tiki-p_share_page.tpl 
Log Message:
[FIX] share page : fix the permission which was deleted in the 1.9 to 1.10 sql script and not replaced by tiki_p_assign_perm_wiki_page. Do you think this 'feature' needs a separate permission or feature ? Let's talk about it. Capitalization from all fields.

Index: tiki-page_bar.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-page_bar.tpl,v
retrieving revision 1.82.2.4
retrieving revision 1.82.2.5
diff -u -d -r1.82.2.4 -r1.82.2.5
--- tiki-page_bar.tpl	1 Dec 2007 15:33:25 -0000	1.82.2.4
+++ tiki-page_bar.tpl	10 Jan 2008 20:44:40 -0000	1.82.2.5
@@ -47,7 +47,7 @@
 {if !$lock and ($tiki_p_admin_wiki eq 'y' or (($tiki_p_lock eq 'y') and ($prefs.feature_wiki_usrlock eq 'y')))}
 <span class="button2"><a href="tiki-index.php?page={$page|escape:"url"}&amp;action=lock" class="linkbut">{tr}Lock{/tr}</a></span>
 {/if}
-{if $tiki_p_share_page eq 'y'}
+{if $tiki_p_assign_perm_wiki_page eq 'y'}
 <span class="button2"><a href="tiki-p_share_page.php?objectId={$page|escape:"url"}&amp;objectType=wiki+page" class="linkbut">{tr}Share Page{/tr}</a></span>
 {/if}
 {if $tiki_p_admin_wiki eq 'y'}

Index: tiki-p_share_page.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-p_share_page.tpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- tiki-p_share_page.tpl	18 Oct 2007 08:51:34 -0000	1.2.2.1
+++ tiki-p_share_page.tpl	10 Jan 2008 20:44:40 -0000	1.2.2.2
@@ -2,29 +2,29 @@
 
 <h1><a class="pagetitle" href="tiki-index.php?page={$objectId}">{$objectId}</a></h1>
 <p>
-<img src="pics/icons/key_active.png" /> {tr}permission assigned to the group{/tr}
+<img src="pics/icons/key_active.png" /> {tr}Permission assigned to the group{/tr}
 </p>
 <p>
-<img src="pics/icons/key.png" /> {tr}permission assigned to the group through a category{/tr}
+<img src="pics/icons/key.png" /> {tr}Permission assigned to the group through a category{/tr}
 </p>
 <form method="post" action="">
 	<table class="normal">
-		<caption>{tr}current permissions{/tr}</caption>
+		<caption>{tr}Current permissions{/tr}</caption>
 		<col width="100"/>
 		<col width="20"/>
 		<col width="20"/>
 		<col width="20"/>
 		<thead>
 			<tr>
-				<th>{tr}group name{/tr}</th>
-				<th>{tr}read{/tr}</th>
-				<th>{tr}read &amp; write{/tr}</th>
-				<th>{tr}no specific permission{/tr}</th>
+				<th>{tr}Group name{/tr}</th>
+				<th>{tr}Read{/tr}</th>
+				<th>{tr}Read &amp; write{/tr}</th>
+				<th>{tr}No specific permission{/tr}</th>
 			</tr>
 		</thead>
 		<tfoot>
 			<tr class="formcolor">
-				<td colspan="4" class="center"><input type="submit" name="apply" value="{tr}apply permissions{/tr}"/></td>
+				<td colspan="4" class="center"><input type="submit" name="apply" value="{tr}Apply permissions{/tr}"/></td>
 			</tr>
 		</tfoot>
 		<tbody>
@@ -33,7 +33,7 @@
 				<td>{$groups[i]->name}</td>
 				{section name=j loop=$columns}
 				{if $groups[i]->getLevel( $columns[j] ) eq 'object'}
-				<td><input type="radio" name="priv[{$groups[i]->name}]" value="{$columns[j]}"{if $groups[i]->isSelected( $columns[j] )}  checked="checked"{/if} /></td>
+				<td><input type="radio" name="priv[{$groups[i]->name}]" value="{$columns[j]}"{if $groups[i]->isSelected( $columns[j] )} checked="checked"{/if} /></td>
 				{/if}
 				{if $groups[i]->getLevel( $columns[j] ) eq 'category'}
 				<td><a href="" title="{$groups[i]->getSourceCategory($columns[j])}"><img src="pics/icons/key.png" border="0"/></a></td>
@@ -43,13 +43,13 @@
 				<td><img src="pics/icons/key_active.png" border="0"/></td>
 				{/if}
 				{/section}
-				<td><input type="radio" name="priv[{$groups[i]->name|escape}]" value="none"{if ! $groups[i]->hasSelection()}  checked="checked"{/if} /></td>
+				<td><input type="radio" name="priv[{$groups[i]->name|escape}]" value="none"{if ! $groups[i]->hasSelection()} checked="checked"{/if} /></td>
 			</tr>
 			{/section}
 		</tbody>
 	</table>
 	<table>
-		<caption>{tr}additional permissions{/tr}</caption>
+		<caption>{tr}Additional permissions{/tr}</caption>
 		<col width="200"/>
 		<col width="200"/>
 		<tr class="formcolor">