Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[55789] trunk
|
From: <li...@us...> - 2015-06-28 20:07:13
|
Revision: 55789
http://sourceforge.net/p/tikiwiki/code/55789
Author: lindonb
Date: 2015-06-28 20:07:10 +0000 (Sun, 28 Jun 2015)
Log Message:
-----------
[REF] add action wrench and necessary icon definitions
Modified Paths:
--------------
trunk/templates/tiki-pagehistory.tpl
trunk/themes/base_files/iconsets/default.php
trunk/themes/base_files/iconsets/glyphicons.php
trunk/themes/base_files/iconsets/legacy.php
Modified: trunk/templates/tiki-pagehistory.tpl
===================================================================
--- trunk/templates/tiki-pagehistory.tpl 2015-06-28 19:17:17 UTC (rev 55788)
+++ trunk/templates/tiki-pagehistory.tpl 2015-06-28 20:07:10 UTC (rev 55789)
@@ -204,8 +204,18 @@
</div>
<input type="hidden" name="show_all_versions" value="{$show_all_versions}">
{/if}
- <div class="table-responsive">
- <table class="table table-condensed table-hover">
+ {* Use css menus as fallback for item dropdown action menu if javascript is not being used *}
+ {if $prefs.javascript_enabled !== 'y'}
+ {$js = 'n'}
+ {$libeg = '<li>'}
+ {$liend = '</li>'}
+ {else}
+ {$js = 'y'}
+ {$libeg = ''}
+ {$liend = ''}
+ {/if}
+ <div class="{if $js === 'y'}table-responsive{/if}"> {* table-responsive class cuts off css drop-down menus *}
+ <table class="table table-condensed table-hover table-striped">
<tr>
{if $tiki_p_remove eq 'y'}<th><input type="submit" class="btn btn-warning btn-sm" name="delete" value="{tr}Delete{/tr}"></th>{/if}
<th>{tr}Information{/tr}</th>
@@ -213,7 +223,7 @@
{if $prefs.feature_contribution eq 'y' and $prefs.feature_contributor_wiki eq 'y'}<th>{tr}Contributors{/tr}</th>{/if}
<th>{tr}Version{/tr}</th>
<th>{icon name="pencil" iclass="tips" ititle=':{tr}HTML or WYSIWYG{/tr}'}</th>
- <th>{tr}Action{/tr}</th>
+ <th></th>
{if $prefs.default_wiki_diff_style != "old" and $history}
<th colspan="2">
<input type="submit" class="btn btn-default btn-sm" name="compare" value="{tr}Compare{/tr}">
@@ -271,10 +281,31 @@
{/if}
</td>
<td class="button_container">
- {self_link page=$page preview=$info.version _title=':{tr}View{/tr}' _class="tips" _icon_name="view"}v{/self_link}
- {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}
- {self_link page=$page source=$info.version _title=':{tr}Source{/tr}' _class="tips" _icon_name="code"}{/self_link}
- {/if}
+ {capture name='current_actions'}
+ {strip}
+ {$libeg}{self_link page=$page preview=$info.version _icon_name="view" _menu_text='y' _menu_icon='y'}
+ {tr}View{/tr}
+ {/self_link}{$liend}
+ {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}
+ {$libeg}{self_link page=$page source=$info.version _icon_name="code" _menu_text='y' _menu_icon='y'}
+ {tr}Source{/tr}
+ {/self_link}{$liend}
+ {/if}
+ {/strip}
+ {/capture}
+ {if $js === 'n'}<ul class="cssmenu_horiz"><li>{/if}
+ <a
+ class="tips"
+ title="{tr}Actions{/tr}"
+ href="#"
+ {if $js === 'y'}{popup delay="0|2000" fullhtml="1" center=true text=$smarty.capture.current_actions|escape:"javascript"|escape:"html"}{/if}
+ style="padding:0; margin:0; border:0"
+ >
+ {icon name='settings'}
+ </a>
+ {if $js === 'n'}
+ <ul class="dropdown-menu" role="menu">{$smarty.capture.current_actions}</ul></li></ul>
+ {/if}
</td>
{if $prefs.default_wiki_diff_style ne "old" and $history}
<td class="button_container">
@@ -344,17 +375,44 @@
{/if}
</td>
<td class="button_container">
- {self_link page=$page preview=$element.version _title=':{tr}View{/tr}' _class="tips" _icon_name="view"}{/self_link}
- {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}
- {self_link page=$page source=$element.version _title=':{tr}Source{/tr}' _class="tips" _icon_name="code"}{/self_link}
+ {capture name='history_actions'}
+ {strip}
+ {$libeg}{self_link page=$page preview=$element.version _icon_name="view" _menu_text='y' _menu_icon='y'}
+ {tr}View{/tr}
+ {/self_link}{$liend}
+ {if $tiki_p_wiki_view_source eq "y" and $prefs.feature_source eq "y"}
+ {$libeg}{self_link page=$page source=$element.version _icon_name="code" _menu_text='y' _menu_icon='y'}
+ {tr}Source{/tr}
+ {/self_link}{$liend}
+ {/if}
+ {if $prefs.default_wiki_diff_style eq "old"}
+ {$libeg}{self_link page=$page diff2=$element.version diff_style="sideview" _icon_name="copy" _menu_text='y' _menu_icon='y'}
+ {tr}Compare{/tr}
+ {/self_link}{$liend}
+ {$libeg}{self_link page=$page diff2=$element.version diff_style="unidiff" _icon_name="difference" _menu_text='y' _menu_icon='y'}
+ {tr}Difference{/tr}
+ {/self_link}{$liend}
+ {/if}
+ {if $tiki_p_rollback eq 'y' && $lock neq true}
+ {$libeg}{self_link _script="tiki-rollback.php" page=$page version=$element.version _icon_name="undo" _menu_text='y' _menu_icon='y'}
+ {tr}Rollback{/tr}
+ {/self_link}
+ {/if}
+ {/strip}
+ {/capture}
+ {if $js === 'n'}<ul class="cssmenu_horiz"><li>{/if}
+ <a
+ class="tips"
+ title="{tr}Actions{/tr}"
+ href="#"
+ {if $js === 'y'}{popup delay="0|2000" fullhtml="1" center=true text=$smarty.capture.history_actions|escape:"javascript"|escape:"html"}{/if}
+ style="padding:0; margin:0; border:0"
+ >
+ {icon name='settings'}
+ </a>
+ {if $js === 'n'}
+ <ul class="dropdown-menu" role="menu">{$smarty.capture.history_actions}</ul></li></ul>
{/if}
- {if $prefs.default_wiki_diff_style eq "old"}
- {self_link page=$page diff2=$element.version diff_style="sideview" _title='{tr}Compare{/tr}'}c{/self_link}
- {self_link page=$page diff2=$element.version diff_style="unidiff" _title='{tr}Diff{/tr}'}d{/self_link}
- {/if}
- {if $tiki_p_rollback eq 'y' && $lock neq true}
- {self_link _script="tiki-rollback.php" page=$page version=$element.version _title=':{tr}Rollback{/tr}' _class="tips" _icon_name="back"}{/self_link}
- {/if}
</td>
{if $prefs.default_wiki_diff_style ne "old"}
<td class="button_container">
Modified: trunk/themes/base_files/iconsets/default.php
===================================================================
--- trunk/themes/base_files/iconsets/default.php 2015-06-28 19:17:17 UTC (rev 55788)
+++ trunk/themes/base_files/iconsets/default.php 2015-06-28 20:07:10 UTC (rev 55789)
@@ -221,6 +221,9 @@
'delete' => array(
'id' => 'times',
),
+ 'difference' => array(
+ 'id' => 'strikethrough',
+ ),
'disable' => array(
'id' => 'minus-square',
),
Modified: trunk/themes/base_files/iconsets/glyphicons.php
===================================================================
--- trunk/themes/base_files/iconsets/glyphicons.php 2015-06-28 19:17:17 UTC (rev 55788)
+++ trunk/themes/base_files/iconsets/glyphicons.php 2015-06-28 20:07:10 UTC (rev 55789)
@@ -87,6 +87,9 @@
'delete' => array(
'id' => 'remove',
),
+ 'difference' => array(
+ 'id' => 'text-color',
+ ),
'disable' => array(
'id' => 'minus-sign',
),
Modified: trunk/themes/base_files/iconsets/legacy.php
===================================================================
--- trunk/themes/base_files/iconsets/legacy.php 2015-06-28 19:17:17 UTC (rev 55788)
+++ trunk/themes/base_files/iconsets/legacy.php 2015-06-28 20:07:10 UTC (rev 55789)
@@ -278,6 +278,9 @@
'delete' => array(
'id' => 'cross',
),
+ 'difference' => array(
+ 'id' => 'text_strikethrough',
+ ),
'disable' => array(
'id' => 'delete',
),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|