tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merged branches/2.2

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-11-10 04:07:03 +00:00
parent 7e072ad785
commit e28bfb2730
3 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetTableField.php
View File

@ -153,6 +153,8 @@ class AssetTableField extends ComplexTableField {
// the ID field confuses the Controller-logic in finding the right view for ReferencedField // the ID field confuses the Controller-logic in finding the right view for ReferencedField
$detailFormFields->removeByName('ID'); $detailFormFields->removeByName('ID');
if($childData) $childData->extend('updateCMSFields', $detailFormFields);
return $detailFormFields; return $detailFormFields;
} }

2
code/CommentAdmin.php
View File

@ -241,7 +241,7 @@ JS;
JS; JS;
} }
function approvemarked() { function acceptmarked() {
$numComments = 0; $numComments = 0;
$folderID = 0; $folderID = 0;
$deleteList = ''; $deleteList = '';

32
templates/Includes/CMSMain_left.ss
View File

@ -106,26 +106,6 @@
</div> </div>
--> -->
<% if EnterpriseCMS %>
<h2 id="heading_tasklist">
<img id="tasklist_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
<img id="tasklist_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />
<% _t('TASKLIST','Tasklist') %>
</h2>
<div class="listpane" id="tasklist_holder" style="display:none">
<div class="unitBody">
</div>
</div>
<h2 id="heading_waitingon">
<img id="waitingon_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
<img id="waitingon_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />
<% _t('WAITINGON','Waiting on') %>
</h2>
<div class="listpane" id="waitingon_holder" style="display:none">
<div class="unitBody">
</div>
</div>
<% end_if %>
<h2 id="heading_versions"> <h2 id="heading_versions">
<img id="versions_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" /> <img id="versions_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
<img id="versions_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> <img id="versions_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />
@ -142,17 +122,7 @@
<div class="unitBody"> <div class="unitBody">
</div> </div>
</div> </div>
<% if EnterpriseCMS %>
<h2 id="heading_comments">
<img id="comments_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
<img id="comments_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />
<% _t('COMMENTS','Comments') %>
</h2>
<div class="listpane" id="comments_holder" style="display:none">
<div class="unitBody">
</div>
</div>
<% end_if %>
<h2 id="heading_reports"> <h2 id="heading_reports">
<img id="reports_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" /> <img id="reports_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
<img id="reports_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> <img id="reports_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />