Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MINOR: Added $extraClass for conditional styling #57

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

MINOR: Added $extraClass for conditional styling #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
badf5c1
closed title tags
mattclegg Mar 29, 2011
0055c24
MINOR For some reason this showed an error in my IDE
mattclegg Apr 5, 2011
3e08f63
BUGFIX Allow for Folder to be extended
mattclegg May 6, 2011
2f438a9
Merge branch 'master' of github.com:mattclegg/DataObjectManager
mattclegg May 6, 2011
4a82237
MINOR: Added $extraClass for conditional styling
mattclegg Jul 26, 2012
69d13c4
Merge branch 'master' of github.com:mattclegg/DataObjectManager
mattclegg Jul 26, 2012
a4591c9
(tidied up some errors)
mattclegg Jul 26, 2012
4b01cf1
(tidied up some more errors)
mattclegg Jul 26, 2012
d7c37d9
removed some whitespace
mattclegg Jul 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added code/.gitignore
View file
Open in desktop
Empty file.
2 changes: 0 additions & 2 deletions code/AssetManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,3 @@ function FieldHolder()


}

?>
4 changes: 1 addition & 3 deletions code/AssetManagerFolder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function updateCMSFields(Fieldset $fields)
'Title' => 30,
'Filename' => 70
));
$folder_filter = "(\"ClassName\" != 'Folder' AND \"ParentID\" = ".$this->owner->ID.")";
$folder_filter = "(\"ClassName\" != 'Folder' AND \"ParentID\" = ".$this->owner->ID.")";
$filter = $a->sourceFilter ? "({$a->sourceFilter}) AND $folder_filter" : $folder_filter;
$a->setSourceFilter($filter);
$a->setParentClass("Folder");
Expand All @@ -27,5 +27,3 @@ public function updateCMSFields(Fieldset $fields)
return $fields;
}
}

?>
2 changes: 1 addition & 1 deletion code/ImageAssetManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ public function __construct($controller, $name, $sourceClass = "Image", $heading
parent::__construct($controller, $name, $sourceClass, null, $headings, $fields, "\"ClassName\" != 'Folder'");
}

}
}
2 changes: 1 addition & 1 deletion code/simple_tinymce_field/javascript/tiny_mce/plugins/style/props.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<td colspan="2">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
<td><input id="text_color" name="text_color" type="text" value="" size="9" onchange="updateColor('text_color_pick','text_color');" /></td>
<td id="text_color_pickcontainer">&nbsp;</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion templates/DataObjectManager.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="$id" class="RequestHandler FormField DataObjectManager $NestedType field" href="$CurrentLink">
<div id="$id" class="RequestHandler FormField DataObjectManager $NestedType field $extraClass" href="$CurrentLink">
<div class="ajax-loader"></div>
<div class="dataobjectmanager-actions <% if HasFilter %>filter<% end_if %>">
<% if Can(add) %>
Expand Down
4 changes: 2 additions & 2 deletions templates/DataObjectManager_popup.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<% if HasPagination %>
<div id="pagination">
<% if PrevRecordLink %>
<div class="prev"><a href="$PrevRecordLink" title=<% _t('PREVIOUS','Previous') %>">&laquo;<% _t('PREVIOUS','Previous') %></a></div>
<div class="prev"><a href="$PrevRecordLink" title="<% _t('PREVIOUS','Previous') %>">&laquo;<% _t('PREVIOUS','Previous') %></a></div>
<% end_if %>
<% if NextRecordLink %>
<div class="next"><a href="$NextRecordLink" title=<% _t('NEXT','Next') %>"><% _t('NEXT','Next') %>&raquo;</a></div>
<div class="next"><a href="$NextRecordLink" title="<% _t('NEXT','Next') %>"><% _t('NEXT','Next') %>&raquo;</a></div>
<% end_if %>
</div>
<% end_if %>
Expand Down
2 changes: 1 addition & 1 deletion templates/FileDataObjectManager.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="$id" class="RequestHandler FormField DataObjectManager FileDataObjectManager TableListField $NestedType field" href="$CurrentLink">
<div id="$id" class="RequestHandler FormField DataObjectManager FileDataObjectManager TableListField $NestedType field $extraClass" href="$CurrentLink">
<div class="ajax-loader"></div>
<div class="dataobjectmanager-actions <% if HasFilter %>filter<% end_if %>">
<% if Can(add) %>
Expand Down
2 changes: 1 addition & 1 deletion templates/ImageDataObjectManager.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="$id" class="RequestHandler FormField DataObjectManager FileDataObjectManager ImageDataObjectManager $NestedType field" href="$CurrentLink">
<div id="$id" class="RequestHandler FormField DataObjectManager FileDataObjectManager ImageDataObjectManager $NestedType field $extraClass" href="$CurrentLink">
<div class="ajax-loader"></div>
<div class="dataobjectmanager-actions <% if HasFilter %>filter<% end_if %>">
<% if Can(upload) %>
Expand Down