From: Jonny B <jm...@no...> - 2008-12-28 14:14:00
|
Hi Sylvie (& both lists) Yes, that makes sense - i only really needed to be able to switch it (mainly icons and backlinks) off, i just added top/bottom position option in case anyone else needed it. Maybe comments and files shouldn't be inside that same tpl? The wouldn't really make sense before the page content... I'm away at the moment so won't be back tiki-ing for a couple of weeks, but go ahead with that now if you like (or remind me after the 6th and i'll do it ;) Happy New Year to you and all jonny on 24/12/08 22:08, Sylvie Greverend at sgr...@gm... wrote: > jonnybradley > Are you sure you want to have the comments and the attachments before > the page too? > I would have prefer only the bar > sylvie > > On Mon, 2008-11-24 at 19:00 +0000, jon...@us... > wrote: >> Revision: 15745 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15745&view=rev >> Author: jonnybradley >> Date: 2008-11-24 19:00:15 +0000 (Mon, 24 Nov 2008) >> >> Log Message: >> ----------- >> [ENH] New prefs for positioning wiki page top and bottom "bars" >> ('page_bar_position' and 'wiki_topline_position') >> >> TODO Magic admin (still trying) >> >> Modified Paths: >> -------------- >> trunk/lib/setup/prefs.php >> trunk/templates/tiki-admin-include-wiki.tpl >> trunk/templates/tiki-show_page.tpl >> trunk/tiki-admin_include_wiki.php >> >> Added Paths: >> ----------- >> trunk/templates/tiki-wiki_topline.tpl >> >> Modified: trunk/lib/setup/prefs.php >> =================================================================== >> --- trunk/lib/setup/prefs.php 2008-11-24 18:11:57 UTC (rev 15744) >> +++ trunk/lib/setup/prefs.php 2008-11-24 19:00:15 UTC (rev 15745) >> @@ -92,6 +92,7 @@ >> 'mailin_autocheck' => 'n', >> 'mailin_autocheckFreq' => '0', >> 'mailin_autocheckLast' => 0, >> + 'page_bar_position' => 'bottom', >> 'warn_on_edit_time' => 2, >> 'wikiHomePage' => 'HomePage', >> 'wikiLicensePage' => '', >> @@ -138,6 +139,7 @@ >> 'wiki_pagename_strip' => '', >> 'wiki_right_column' => 'y', >> 'wiki_top_bar' => 'y', >> + 'wiki_topline_position' => 'top', >> 'wiki_uses_slides' => 'n', >> 'wiki_watch_author' => 'n', >> 'wiki_watch_comments' => 'y', >> >> Modified: trunk/templates/tiki-admin-include-wiki.tpl >> =================================================================== >> --- trunk/templates/tiki-admin-include-wiki.tpl 2008-11-24 18:11:57 UTC (rev >> 15744) >> +++ trunk/templates/tiki-admin-include-wiki.tpl 2008-11-24 19:00:15 UTC (rev >> 15745) >> @@ -648,6 +648,21 @@ >> <tr><td class="form">{tr}Regex search and replace:{/tr}</td><td><input >> type="checkbox" name="feature_wiki_replace" {if $prefs.feature_wiki_replace >> eq 'y'}checked="checked"{/if}/></td></tr> >> <tr><td class="form">{tr}Edit section:{/tr}</td><td><input type="checkbox" >> name="wiki_edit_section" {if $prefs.wiki_edit_section eq >> 'y'}checked="checked"{/if}/></td></tr> >> <tr><td class="form">{tr}Log bytes changes (+/-) in Action Logs (slows each >> page modifications){/tr}</td><td><input type="checkbox" >> name="feature_actionlog_bytes" {if $prefs.feature_actionlog_bytes eq >> 'y'}checked="checked"{/if}/></td></tr> >> + <tr><td class="form">{tr}Wiki top line (description, icons, backlinks >> etc):{/tr}</td><td> >> + <select name="wiki_topline_position"> >> + <option value="top" {if $prefs.wiki_topline_position eq >> 'top'}selected="selected"{/if}>{tr}Top bar{/tr}</option> >> + <option value="bottom" {if $prefs.wiki_topline_position eq >> 'bottom'}selected="selected"{/if}>{tr}Bottom bar{/tr}</option> >> + <option value="both" {if $prefs.wiki_topline_position eq >> 'both'}selected="selected"{/if}>{tr}Both{/tr}</option> >> + <option value="none" {if $prefs.wiki_topline_position eq >> 'none'}selected="selected"{/if}>{tr}Neither{/tr}</option> >> + </select> >> + </td></tr> >> + <tr><td class="form">{tr}Wiki bottom buttons (Edit, Source, Remove >> etc):{/tr}</td><td> >> + <select name="page_bar_position"> >> + <option value="top" {if $prefs.page_bar_position eq >> 'top'}selected="selected"{/if}>{tr}Top bar{/tr}</option> >> + <option value="bottom" {if $prefs.page_bar_position eq >> 'bottom'}selected="selected"{/if}>{tr}Bottom bar{/tr}</option> >> + <option value="none" {if $prefs.page_bar_position eq >> 'none'}selected="selected"{/if}>{tr}Neither{/tr}</option> >> + </select> >> + </td></tr> >> <tr><td colspan="2" class="button"><input type="submit" >> name="wikifeatures" value="{tr}Set features{/tr}" /></td></tr> >> </table> >> </form> >> >> Modified: trunk/templates/tiki-show_page.tpl >> =================================================================== >> --- trunk/templates/tiki-show_page.tpl 2008-11-24 18:11:57 UTC (rev 15744) >> +++ trunk/templates/tiki-show_page.tpl 2008-11-24 19:00:15 UTC (rev 15745) >> @@ -36,102 +36,15 @@ >> {/if} >> {/if} {*hide_page_header*} >> >> -<div class="wikitopline" style="clear: both;"> >> - <div class="content"> >> - {if !$hide_page_header} >> - <div class="wikiinfo" style="float: left"> >> -{if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'} >> - <small><a class="link" href="tiki-index.php?page_id={$page_id}">{tr}page >> id{/tr}: {$page_id}</a></small> >> +{if !$prefs.wiki_topline_position or $prefs.wiki_topline_position eq 'top' >> or $prefs.wiki_topline_position eq 'both'} >> +{include file=tiki-wiki_topline.tpl} >> {/if} >> - >> -{breadcrumbs type="desc" loc="page" crumbs=$crumbs} >> - >> -{if $cached_page eq 'y'}<small>({tr}Cached{/tr})</small>{/if} >> -{if $is_categorized eq 'y' and $prefs.feature_categories eq 'y' and >> $prefs.feature_categorypath eq 'y'} >> - {$display_catpath} >> -{/if} >> - </div> >> {if $print_page ne 'y'} >> - <div class="wikiactions" style="float: right; padding-left:10px; >> white-space: nowrap"> >> - <div class="icons" style="float: left;"> >> - {if $pdf_export eq 'y'} >> - <a href="tiki-print.php?{query display="pdf"}" >> title="{tr}PDF{/tr}">{icon _id='page_white_acrobat' alt="{tr}PDF{/tr}"}</a> >> - {/if} >> - {if $editable and ($tiki_p_edit eq 'y' or $page|lower eq 'sandbox') and >> $beingEdited ne 'y' or $canEditStaging eq 'y'} >> - <a title="{tr}Edit{/tr}" {ajax_href template="tiki-editpage.tpl" >> htmlelement="tiki-center"}tiki-editpage.php?page={if $needsStaging eq >> 'y'}{$stagingPageName|escape:"url"}{else}{$page|escape:"url"}{/if}{if >> !empty($page_ref_id) and $needsStaging neq >> 'y'}&page_ref_id={$page_ref_id}{/if}{/ajax_href}>{icon >> _id='page_edit'}</a> >> - {/if} >> - {if $prefs.feature_morcego eq 'y' && $prefs.wiki_feature_3d eq 'y'} >> - <a title="{tr}3d browser{/tr}" >> href="javascript:wiki3d_open('{$page|escape}',{$prefs.wiki_3d_width}, >> {$prefs.wiki_3d_height})">{icon _id='wiki3d' alt="{tr}3d browser{/tr}"}</a> >> - {/if} >> - {if $cached_page eq 'y'} >> - <a title="{tr}Refresh{/tr}" >> href="tiki-index.php?page={$page|escape:"url"}&refresh=1">{icon >> _id='arrow_refresh'}</a> >> - {/if} >> - {if $prefs.feature_wiki_print eq 'y'} >> - <a title="{tr}Print{/tr}" href="tiki-print.php?{if >> !empty($page_ref_id)}page_ref_id={$page_ref_id}&{/if}page={$page|escape:" >> url"}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> >> - {/if} >> +{if $prefs.page_bar_position eq 'top'} >> +{include file=tiki-page_bar.tpl} >> +{/if} >> +{/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 $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y'} >> - <a title="{tr}Save to notepad{/tr}" >> href="tiki-index.php?page={$page|escape:"url"}&savenotepad=1{if >> !empty($page_ref_id)}&page_ref_id={$page_ref_id}{/if}">{icon _id='disk' >> alt="{tr}Save to notepad{/tr}"}</a> >> - {/if} >> - {if $user and $prefs.feature_user_watches eq 'y'} >> - {if $user_watching_page eq 'n'} >> - <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=wiki_page_chan >> ged&watch_object={$page|escape:"url"}&watch_action=add{if $structure >> eq 'y'}&structure={$home_info.pageName|escape:'url'}{/if}" >> class="icon">{icon _id='eye' alt='{tr}Monitor this Page{/tr}'}</a> >> - {else} >> - <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=wiki_page_chan >> ged&watch_object={$page|escape:"url"}&watch_action=remove{if >> $structure eq 'y'}&structure={$home_info.pageName|escape:'url'}{/if}" >> class="icon">{icon _id='no_eye' alt='{tr}Stop Monitoring this Page{/tr}'}</a> >> - {/if} >> - {if $structure == 'y' and $tiki_p_watch_structure eq 'y'} >> - {if $user_watching_structure ne 'y'} >> - <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=structure_chan >> ged&watch_object={$page_info.page_ref_id}&watch_action=add_desc&s >> tructure={$home_info.pageName|escape:'url'}">{icon _id='eye_arrow_down' >> alt='{tr}Monitor the Sub-Structure{/tr}'}</a> >> - {else} >> - <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=structure_chan >> ged&watch_object={$page_info.page_ref_id}&watch_action=remove_desc&am >> p;structure={$home_info.pageName|escape:'url'}">{icon _id='no_eye_arrow_down' >> alt='{tr}Stop Monitoring the Sub-Structure{/tr}'}</a> >> - {/if} >> - {/if} >> - {/if} >> - </div><!-- END of icons --> >> - >> - {if $prefs.feature_backlinks eq 'y' and $backlinks} >> - <form action="tiki-index.php" method="get" style="display: block; float: >> left"> >> - <select name="page" onchange="page.form.submit()"> >> - <option>{tr}Backlinks{/tr}...</option> >> - {section name=back loop=$backlinks} >> - <option >> value="{$backlinks[back].fromPage}">{$backlinks[back].fromPage}</option> >> - {/section} >> - </select> >> - </form> >> - {/if} >> - >> - {if $structure == 'y' and count($showstructs) > 1 or $structure eq 'n' and >> count($showstructs) ne 0 } >> - <form action="tiki-index.php" method="post" style="float: left"> >> - <select name="page_ref_id" onchange="page_ref_id.form.submit()"> >> - <option>{tr}Structures{/tr}...</option> >> - {section name=struct loop=$showstructs} >> - <option value="{$showstructs[struct].req_page_ref_id}" {if >> $showstructs[struct].pageName eq >> $structure_path[0].pageName}selected="selected"{/if}> >> - {if $showstructs[struct].page_alias} >> - {$showstructs[struct].page_alias} >> - {else} >> - {$showstructs[struct].pageName} >> - {/if} >> - </option> >> - {/section} >> - </select> >> - </form> >> - {/if} >> - >> - {if $prefs.feature_multilingual == 'y' && >> $prefs.show_available_translations eq 'y'} >> - <div style="float: left"> >> - {include file="translated-lang.tpl" td='n'} >> - </div> >> - {/if} >> - </div> >> - <br class="clear" style="clear: both" /> >> -{/if}{* <-- end of if $print_page ne 'y' *} >> -{/if} {*hide_page_header*} >> - </div> >> -</div> >> - >> {if isset($saved_msg) && $saved_msg neq ''} >> {remarksbox type="note" title="{tr}Note{/tr}"}{$saved_msg}{/remarksbox} >> {/if} >> @@ -341,6 +254,11 @@ >> {$display_catobjects} >> {/if} >> >> +{if $prefs.wiki_topline_position eq 'bottom' or $prefs.wiki_topline_position >> eq 'both'} >> +{include file=tiki-wiki_topline.tpl} >> +{/if} >> {if $print_page ne 'y'} >> -{include file=tiki-page_bar.tpl} >> +{if !$prefs.page_bar_position or $prefs.page_bar_position eq 'bottom' or >> $prefs.page_bar_position eq 'both'} >> +{include file=tiki-page_bar.tpl} >> {/if} >> +{/if} >> >> Added: trunk/templates/tiki-wiki_topline.tpl >> =================================================================== >> --- trunk/templates/tiki-wiki_topline.tpl (rev 0) >> +++ trunk/templates/tiki-wiki_topline.tpl 2008-11-24 19:00:15 UTC (rev 15745) >> @@ -0,0 +1,95 @@ >> +<div class="wikitopline" style="clear: both;"> >> + <div class="content"> >> + {if !$hide_page_header} >> + <div class="wikiinfo" style="float: left"> >> +{if $prefs.feature_wiki_pageid eq 'y' and $print_page ne 'y'} >> + <small><a class="link" href="tiki-index.php?page_id={$page_id}">{tr}page >> id{/tr}: {$page_id}</a></small> >> +{/if} >> + >> +{breadcrumbs type="desc" loc="page" crumbs=$crumbs} >> + >> +{if $cached_page eq 'y'}<small>({tr}Cached{/tr})</small>{/if} >> +{if $is_categorized eq 'y' and $prefs.feature_categories eq 'y' and >> $prefs.feature_categorypath eq 'y'} >> + {$display_catpath} >> +{/if} >> + </div> >> +{if $print_page ne 'y'} >> + <div class="wikiactions" style="float: right; padding-left:10px; >> white-space: nowrap"> >> + <div class="icons" style="float: left;"> >> + {if $pdf_export eq 'y'} >> + <a href="tiki-print.php?{query display="pdf"}" >> title="{tr}PDF{/tr}">{icon _id='page_white_acrobat' alt="{tr}PDF{/tr}"}</a> >> + {/if} >> + {if $editable and ($tiki_p_edit eq 'y' or $page|lower eq 'sandbox') and >> $beingEdited ne 'y' or $canEditStaging eq 'y'} >> + <a title="{tr}Edit{/tr}" {ajax_href template="tiki-editpage.tpl" >> htmlelement="tiki-center"}tiki-editpage.php?page={if $needsStaging eq >> 'y'}{$stagingPageName|escape:"url"}{else}{$page|escape:"url"}{/if}{if >> !empty($page_ref_id) and $needsStaging neq >> 'y'}&page_ref_id={$page_ref_id}{/if}{/ajax_href}>{icon >> _id='page_edit'}</a> >> + {/if} >> + {if $prefs.feature_morcego eq 'y' && $prefs.wiki_feature_3d eq 'y'} >> + <a title="{tr}3d browser{/tr}" >> href="javascript:wiki3d_open('{$page|escape}',{$prefs.wiki_3d_width}, >> {$prefs.wiki_3d_height})">{icon _id='wiki3d' alt="{tr}3d browser{/tr}"}</a> >> + {/if} >> + {if $cached_page eq 'y'} >> + <a title="{tr}Refresh{/tr}" >> href="tiki-index.php?page={$page|escape:"url"}&refresh=1">{icon >> _id='arrow_refresh'}</a> >> + {/if} >> + {if $prefs.feature_wiki_print eq 'y'} >> + <a title="{tr}Print{/tr}" href="tiki-print.php?{if >> !empty($page_ref_id)}page_ref_id={$page_ref_id}&{/if}page={$page|escape:" >> url"}">{icon _id='printer' alt="{tr}Print{/tr}"}</a> >> + {/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 $user and $prefs.feature_notepad eq 'y' and $tiki_p_notepad eq 'y'} >> + <a title="{tr}Save to notepad{/tr}" >> href="tiki-index.php?page={$page|escape:"url"}&savenotepad=1{if >> !empty($page_ref_id)}&page_ref_id={$page_ref_id}{/if}">{icon _id='disk' >> alt="{tr}Save to notepad{/tr}"}</a> >> + {/if} >> + {if $user and $prefs.feature_user_watches eq 'y'} >> + {if $user_watching_page eq 'n'} >> + <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=wiki_page_chan >> ged&watch_object={$page|escape:"url"}&watch_action=add{if $structure >> eq 'y'}&structure={$home_info.pageName|escape:'url'}{/if}" >> class="icon">{icon _id='eye' alt='{tr}Monitor this Page{/tr}'}</a> >> + {else} >> + <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=wiki_page_chan >> ged&watch_object={$page|escape:"url"}&watch_action=remove{if >> $structure eq 'y'}&structure={$home_info.pageName|escape:'url'}{/if}" >> class="icon">{icon _id='no_eye' alt='{tr}Stop Monitoring this Page{/tr}'}</a> >> + {/if} >> + {if $structure == 'y' and $tiki_p_watch_structure eq 'y'} >> + {if $user_watching_structure ne 'y'} >> + <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=structure_chan >> ged&watch_object={$page_info.page_ref_id}&watch_action=add_desc&s >> tructure={$home_info.pageName|escape:'url'}">{icon _id='eye_arrow_down' >> alt='{tr}Monitor the Sub-Structure{/tr}'}</a> >> + {else} >> + <a >> href="tiki-index.php?page={$page|escape:"url"}&watch_event=structure_chan >> ged&watch_object={$page_info.page_ref_id}&watch_action=remove_desc&am >> p;structure={$home_info.pageName|escape:'url'}">{icon _id='no_eye_arrow_down' >> alt='{tr}Stop Monitoring the Sub-Structure{/tr}'}</a> >> + {/if} >> + {/if} >> + {/if} >> + </div><!-- END of icons --> >> + >> + {if $prefs.feature_backlinks eq 'y' and $backlinks} >> + <form action="tiki-index.php" method="get" style="display: block; float: >> left"> >> + <select name="page" onchange="page.form.submit()"> >> + <option>{tr}Backlinks{/tr}...</option> >> + {section name=back loop=$backlinks} >> + <option >> value="{$backlinks[back].fromPage}">{$backlinks[back].fromPage}</option> >> + {/section} >> + </select> >> + </form> >> + {/if} >> + >> + {if $structure == 'y' and count($showstructs) > 1 or $structure eq 'n' and >> count($showstructs) ne 0 } >> + <form action="tiki-index.php" method="post" style="float: left"> >> + <select name="page_ref_id" onchange="page_ref_id.form.submit()"> >> + <option>{tr}Structures{/tr}...</option> >> + {section name=struct loop=$showstructs} >> + <option value="{$showstructs[struct].req_page_ref_id}" {if >> $showstructs[struct].pageName eq >> $structure_path[0].pageName}selected="selected"{/if}> >> + {if $showstructs[struct].page_alias} >> + {$showstructs[struct].page_alias} >> + {else} >> + {$showstructs[struct].pageName} >> + {/if} >> + </option> >> + {/section} >> + </select> >> + </form> >> + {/if} >> + >> + {if $prefs.feature_multilingual == 'y' && >> $prefs.show_available_translations eq 'y'} >> + <div style="float: left"> >> + {include file="translated-lang.tpl" td='n'} >> + </div> >> + {/if} >> + </div> >> + <br class="clear" style="clear: both" /> >> +{/if} {* <-- end of if $print_page ne 'y' *} >> +{/if} {*hide_page_header*} >> + </div> {* div.content *} >> +</div> {* div.wikitopline *} >> >> Modified: trunk/tiki-admin_include_wiki.php >> =================================================================== >> --- trunk/tiki-admin_include_wiki.php 2008-11-24 18:11:57 UTC (rev 15744) >> +++ trunk/tiki-admin_include_wiki.php 2008-11-24 19:00:15 UTC (rev 15745) >> @@ -192,7 +192,9 @@ >> 'wiki_authors_style', >> 'feature_wiki_mandatory_category', >> 'wiki_page_navigation_bar', >> - 'wiki_actions_bar' >> + 'wiki_actions_bar', >> + 'wiki_topline_position', >> + 'page_bar_position' >> ); >> foreach ($pref_values as $value) { >> simple_set_value($value); >> >> >> This was sent by the SourceForge.net collaborative development platform, the >> world's largest Open Source development site. >> >> ------------------------------------------------------------------------- >> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge >> Build the coolest Linux based applications with Moblin SDK & win great prizes >> Grand prize is a trip for two to an Open Source event anywhere in the world >> http://moblin-contest.org/redirect.php?banner_id=100&url=/ >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------------ > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |