Peter M. Groen / knowledgetree

Commit 7ab4fd0a17257b52ecc4e41f2dcded2edf7baeb7

Authored by bshuttle
1 parent e3e4cdbd

- don't show version info for document on normal page 

- highlight it on compare page
- allow one-click return to normal view (since details is turned off at this point).


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5859 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 15 additions and 35 deletions
templates/ktcore/document/compare.smarty
  View file @7ab4fd0
1 <h2>{i18n}Version Comparison{/i18n}: {$document->getName()}</h2> 1 <h2>{i18n}Version Comparison{/i18n}: {$document->getName()}</h2>
  2 +
  3 +
2 {capture assign=from} 4 {capture assign=from}
3 <strong>{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</strong> ({$document->getMetadataVersion()}) 5 <strong>{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</strong> ({$document->getMetadataVersion()})
4 {/capture} 6 {/capture}
5 {capture assign=to} 7 {capture assign=to}
6 <strong>{$comparison_document->getMajorVersionNumber()}.{$comparison_document->getMinorVersionNumber()}</strong> ({$comparison_document->getMetadataVersion()}) 8 <strong>{$comparison_document->getMajorVersionNumber()}.{$comparison_document->getMinorVersionNumber()}</strong> ({$comparison_document->getMetadataVersion()})
7 {/capture} 9 {/capture}
8 -<p class="descriptiveText">  
9 -{i18n arg_from=$from arg_to=$to}showing comparison between versions #from# and #to#{/i18n}</p>  
10 -  
11 -<!--  
12 - its possible that one of the versions isn't "real"  
13 - and it isn't entirely clear how to show that to the  
14 - user in the best possible way.  
15 ---> 10 +<div class="ktInfo"><p>
  11 +{i18n arg_from=$from arg_to=$to}showing comparison between versions #from# and #to#. {/i18n}
  12 +<a href="{addQS context=$context}action=main{/addQS}">{i18n}View current version{/i18n}</a>.
  13 +</p></div>
16 14
17 {if ($document_data.is_manufactured)} 15 {if ($document_data.is_manufactured)}
18 <p class="descriptiveText"><strong class="ktInlineError">{i18n}Please 16 <p class="descriptiveText"><strong class="ktInlineError">{i18n}Please
templates/kt3/view_document.smarty renamed to templates/ktcore/document/view.smarty
  View file @7ab4fd0
1 <h2>{$document->getName()|escape}</h2> 1 <h2>{$document->getName()|escape}</h2>
2 -{capture assign=version}  
3 -{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}  
4 -{/capture}  
5 -<p class="descriptiveText">{i18n arg_version=$version}showing information for <strong>version  
6 -#version#</strong>{/i18n}</p> 2 +
7 {if ($document->getIsCheckedOut() == 1)} 3 {if ($document->getIsCheckedOut() == 1)}
8 {capture assign=checkout_user}<strong>{$sCheckoutUser}</strong>{/capture} 4 {capture assign=checkout_user}<strong>{$sCheckoutUser}</strong>{/capture}
9 {if ($isCheckoutUser)} 5 {if ($isCheckoutUser)}
@@ -47,31 +43,17 @@ these tasks, use the Request Assistance action.{/i18n} @@ -47,31 +43,17 @@ these tasks, use the Request Assistance action.{/i18n}
47 <!-- Document "Views" --> 43 <!-- Document "Views" -->
48 <div id="document-views"> 44 <div id="document-views">
49 45
  46 +<div class="ktError"><p>Someone please suggest some "viewlets" we can ship by default ...
  47 +this is a tad bare.</p></div>
  48 +
  49 +{*
50 <div class="downloadbox"> 50 <div class="downloadbox">
51 <ul> 51 <ul>
52 - <li class="view_details"><a href="#">Document Details</a></li>  
53 - <li class="download"><a href="#">Download</a></li>  
54 - <li class="checkout"><a href="#">Checkout</a></li>  
55 - <li class="checkin"><a href="#">Check-in</a></li>  
56 - <li class="cancel_checkout"><a href="#">Cancel Checkout</a></li> 52 + {foreach from=$viewlet_info item=aInfo}
  53 + <li class="{$aInfo.icon_class}"><a href="{$aInfo.url}">{$aInfo.name}</a></li>
  54 + {/foreach}
57 </ul> 55 </ul>
58 - <span class="descriptiveText" style="font-size: xx-small">Note: this is a mockup - only some would be here, obviously.</span>  
59 </div> 56 </div>
  57 +*}
60 58
61 -<div class="viewlet">  
62 - <h3>Information about "asd asd s"</h3>  
63 -<ul class="actionlist">  
64 -<li><a href="http://ktdevlocal/knowledgeTree-csstidy/control.php?action=viewDocument&qs=action%3Dhistory%26fDocumentId%3D8"  
65 - >Transaction History</a></li>  
66 -<li><a href="http://ktdevlocal/knowledgeTree-csstidy/control.php?action=viewDocument&qs=action%3Dversionhistory%26fDocumentId%3D8"  
67 - >Version History</a></li>  
68 -<li><a href="/knowledgeTree-csstidy/action.php?kt_path_info=ktcore.actions.document.permissions&fDocumentId=8"  
69 - >Permissions</a></li>  
70 -<li><a href="/knowledgeTree-csstidy/action.php?kt_path_info=ktcore.actions.document.roles&fDocumentId=8"  
71 - >View Roles</a></li>  
72 -<li><a href="/knowledgeTree-csstidy/action.php?kt_path_info=ktcore.actions.document.discussion&fDocumentId=8"  
73 - >Discussion</a></li>  
74 -</ul>  
75 </div> 59 </div>
76 -  
77 -</div>  
78 \ No newline at end of file 60 \ No newline at end of file