this.f_width-10&&(g=this.f_width-10),this.search_field.setStyle({width:g+"px"}),a=this.container.getHeight(),this.dropdown.setStyle({top:a+"px"})}},d}(AbstractChosen),c.Chosen=a,Prototype.Browser.IE&&/MSIE (\d+\.\d+);/.test(navigator.userAgent)&&(Prototype.BrowserFeatures.Version=new Number(RegExp.$1)),b=function(a){var b,c;return b=new Element.Layout(a),c=b.get("border-left")+b.get("border-right")+b.get("padding-left")+b.get("padding-right")},c.get_side_border_padding=b}.call(this)
\ No newline at end of file
diff --git a/admin/thirdparty/chosen/coffee/chosen.jquery.coffee b/admin/thirdparty/chosen/coffee/chosen.jquery.coffee
index d65d0354a..ae71f9e55 100644
--- a/admin/thirdparty/chosen/coffee/chosen.jquery.coffee
+++ b/admin/thirdparty/chosen/coffee/chosen.jquery.coffee
@@ -40,7 +40,7 @@ class Chosen extends AbstractChosen
if @is_multiple
container_div.html ''
else
- container_div.html '' + @default_text + '
'
+ container_div.html '' + @default_text + '
'
@form_field_jq.hide().after container_div
@container = ($ '#' + @container_id)
@@ -108,7 +108,7 @@ class Chosen extends AbstractChosen
container_mousedown: (evt) ->
if !@is_disabled
target_closelink = if evt? then ($ evt.target).hasClass "search-choice-close" else false
- if evt and evt.type is "mousedown"
+ if evt and evt.type is "mousedown" and not @results_showing
evt.stopPropagation()
if not @pending_destroy_click and not target_closelink
if not @active_field
@@ -187,7 +187,7 @@ class Chosen extends AbstractChosen
if data.selected and @is_multiple
this.choice_build data
else if data.selected and not @is_multiple
- @selected_item.find("span").text data.text
+ @selected_item.removeClass("chzn-default").find("span").text data.text
this.single_deselect_control_build() if @allow_single_deselect
this.search_field_disabled()
@@ -315,6 +315,7 @@ class Chosen extends AbstractChosen
results_reset: (evt) ->
@form_field.options[0].selected = true
@selected_item.find("span").text @default_text
+ @selected_item.addClass("chzn-default") if not @is_multiple
this.show_search_field_default()
$(evt.target).remove();
@form_field_jq.trigger "change"
@@ -332,6 +333,7 @@ class Chosen extends AbstractChosen
else
@search_results.find(".result-selected").removeClass "result-selected"
@result_single_selected = high
+ @selected_item.removeClass("chzn-default")
high.addClass "result-selected"
@@ -383,7 +385,8 @@ class Chosen extends AbstractChosen
results = 0
searchText = if @search_field.val() is @default_text then "" else $('').text($.trim(@search_field.val())).html()
- regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
+ regexAnchor = if @search_contains then "" else "^"
+ regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
for option in @results_data
diff --git a/admin/thirdparty/chosen/coffee/chosen.proto.coffee b/admin/thirdparty/chosen/coffee/chosen.proto.coffee
index 4c306a766..d63d64047 100644
--- a/admin/thirdparty/chosen/coffee/chosen.proto.coffee
+++ b/admin/thirdparty/chosen/coffee/chosen.proto.coffee
@@ -16,7 +16,7 @@ class Chosen extends AbstractChosen
super()
# HTML Templates
- @single_temp = new Template('#{default}
')
+ @single_temp = new Template('#{default}
')
@multi_temp = new Template('')
@choice_temp = new Template('#{choice}')
@no_results_temp = new Template('' + @results_none_found + ' "#{terms}"')
@@ -101,7 +101,7 @@ class Chosen extends AbstractChosen
container_mousedown: (evt) ->
if !@is_disabled
target_closelink = if evt? then evt.target.hasClassName "search-choice-close" else false
- if evt and evt.type is "mousedown"
+ if evt and evt.type is "mousedown" and not @results_showing
evt.stop()
if not @pending_destroy_click and not target_closelink
if not @active_field
@@ -179,7 +179,7 @@ class Chosen extends AbstractChosen
if data.selected and @is_multiple
this.choice_build data
else if data.selected and not @is_multiple
- @selected_item.down("span").update( data.html )
+ @selected_item.removeClassName("chzn-default").down("span").update( data.html )
this.single_deselect_control_build() if @allow_single_deselect
this.search_field_disabled()
@@ -308,6 +308,7 @@ class Chosen extends AbstractChosen
results_reset: (evt) ->
@form_field.options[0].selected = true
@selected_item.down("span").update(@default_text)
+ @selected_item.addClassName("chzn-default") if not @is_multiple
this.show_search_field_default()
evt.target.remove()
@form_field.simulate("change") if typeof Event.simulate is 'function'
@@ -322,6 +323,7 @@ class Chosen extends AbstractChosen
this.result_deactivate high
else
@search_results.descendants(".result-selected").invoke "removeClassName", "result-selected"
+ @selected_item.removeClassName("chzn-default")
@result_single_selected = high
high.addClassName("result-selected")
@@ -374,7 +376,8 @@ class Chosen extends AbstractChosen
results = 0
searchText = if @search_field.value is @default_text then "" else @search_field.value.strip().escapeHTML()
- regex = new RegExp('^' + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
+ regexAnchor = if @search_contains then "" else "^"
+ regex = new RegExp(regexAnchor + searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
zregex = new RegExp(searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"), 'i')
for option in @results_data
diff --git a/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee b/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee
index a7c1b01da..dc68b7da9 100644
--- a/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee
+++ b/admin/thirdparty/chosen/coffee/lib/abstract-chosen.coffee
@@ -29,6 +29,7 @@ class AbstractChosen
@result_single_selected = null
@allow_single_deselect = if @options.allow_single_deselect? and @form_field.options[0]? and @form_field.options[0].text is "" then @options.allow_single_deselect else false
@disable_search_threshold = @options.disable_search_threshold || 0
+ @search_contains = @options.search_contains || false
@choices = 0
@results_none_found = @options.no_results_text or "No results match"
diff --git a/admin/thirdparty/chosen/example.proto.html b/admin/thirdparty/chosen/example.proto.html
index 77c48c71f..d24a08bbf 100644
--- a/admin/thirdparty/chosen/example.proto.html
+++ b/admin/thirdparty/chosen/example.proto.html
@@ -1343,7 +1343,7 @@ orgia and The South Sandwich Islands">South Georgia and The South Sandwich Islan
Using Chosen is easy as can be.
- Download the plugin and copy the chosen files to your app.
- - Activate the plugin by creating a new instance of Chosen: New Chosen(some_form_field);
+ - Activate the plugin by creating a new instance of Chosen: new Chosen(some_form_field);
- Disco.
diff --git a/admin/thirdparty/chosen/package.json b/admin/thirdparty/chosen/package.json
index a26bb42c8..a97f4f48b 100644
--- a/admin/thirdparty/chosen/package.json
+++ b/admin/thirdparty/chosen/package.json
@@ -1,7 +1,7 @@
{
"author": "harvest",
"name": "chosen",
- "version": "0.9.7",
+ "version": "0.9.8",
"description": "Chosen is a JavaScript plugin that makes long, unwieldy select boxes much more user-friendly. It is currently available in both jQuery and Prototype flavors.",
"repository": {
"type": "git",
diff --git a/css/AssetUploadField.css b/css/AssetUploadField.css
index 75de568af..d4d9b52b5 100644
--- a/css/AssetUploadField.css
+++ b/css/AssetUploadField.css
@@ -6,6 +6,8 @@
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
#AssetUploadField { border-bottom: 0; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
+body.cms.ss-uploadfield-edit-iframe { padding: 16px; overflow: auto; }
+
.ss-assetuploadfield h3 { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px; padding: 0 0 7px; clear: both; }
.ss-assetuploadfield .field { border-bottom: 0; }
.ss-assetuploadfield .ss-uploadfield-files { margin: 0; padding: 0; }
@@ -30,7 +32,7 @@
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel { position: absolute; top: 7px; right: 7px; }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-cancel button { display: block; overflow: hidden; text-indent: -9999px; padding: 0; margin: 0; border: 0; width: 16px; height: 16px; cursor: pointer; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform { /* don't use display none, for it will break jQuery('iframe').contents().height() */ height: 0; overflow: hidden; clear: both; }
-.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { margin: 16px; width: 100%; }
+.ss-assetuploadfield .ss-uploadfield-files .ss-uploadfield-item-editform iframe { width: 100%; }
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-info { float: left; margin: 19px 0 0; }
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-fromcomputer { position: relative; overflow: hidden; display: block; margin: 0 10px 0 0; }
.ss-assetuploadfield .ss-uploadfield-addfile .ss-uploadfield-item-uploador { float: left; font-weight: bold; font-size: 22px; padding: 0 20px; line-height: 70px; display: none; }
diff --git a/css/GridField.css b/css/GridField.css
index e2e67e4c9..8d8d74f78 100644
--- a/css/GridField.css
+++ b/css/GridField.css
@@ -12,11 +12,12 @@
.cms table.ss-gridfield-table thead { color: #1d2224; background: transparent; }
.cms table.ss-gridfield-table thead tr.filter-header .fieldgroup { max-width: 512px; }
.cms table.ss-gridfield-table tbody { background: #FFF; }
+.cms table.ss-gridfield-table tbody td { width: 100%; }
+.cms table.ss-gridfield-table tbody td.col-buttons { width: auto; text-align: right; white-space: nowrap; }
.cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; }
.cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.cms table.ss-gridfield-table tbody td button.ui-state-active { border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
-.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; width: 16px; height: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; }
-.cms table.ss-gridfield-table tbody td.col-buttons { white-space: nowrap; }
+.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; width: 16px; height: 20px; text-indent: 9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; }
.cms table.ss-gridfield-table tfoot { color: #1d2224; }
.cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); }
.cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; }
@@ -45,6 +46,7 @@
.cms table.ss-gridfield-table tr th.action { border-right: 0; }
.cms table.ss-gridfield-table tr th.first { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; }
.cms table.ss-gridfield-table tr th.last { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; }
+.cms table.ss-gridfield-table tr th button#action_gridfield_relationadd:hover { color: #444 !important; /* Not sure why IE think it needs this */ }
.cms table.ss-gridfield-table tr th button:hover { color: #ccc !important; /* Not sure why IE think it needs this */ }
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
.cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
diff --git a/forms/OptionsetField.php b/forms/OptionsetField.php
index 50a39f6c0..353f8201d 100644
--- a/forms/OptionsetField.php
+++ b/forms/OptionsetField.php
@@ -28,10 +28,10 @@
*
*
* //Database request for the object
- * $myDoSet = DataObject::get("FooBars","");
+ * $myDoSet = DataList::create("FooBars","");
* if($myDoSet){
* // This returns an array of ID => Title
- * $map = $myDoSet->toDropDownMap();
+ * $map = $myDoSet->map();
*
* // Instantiate the OptionsetField
* $FieldList = new FieldList(
diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js
index efabd2c6e..3f5967af8 100644
--- a/javascript/lang/en_US.js
+++ b/javascript/lang/en_US.js
@@ -11,6 +11,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
'UNIQUEFIELD.CANNOTLEAVEEMPTY': 'This field cannot be left empty',
'RESTRICTEDTEXTFIELD.CHARCANTBEUSED': "The character '%s' cannot be used in this field",
'UPDATEURL.CONFIRM': 'Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s',
+ 'UPDATEURL.CONFIRMURLCHANGED':'The URL has been changed to\n"%s"',
'FILEIFRAMEFIELD.DELETEFILE': 'Delete File',
'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File',
'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image',
diff --git a/model/DataList.php b/model/DataList.php
index 1984af0df..931419c25 100644
--- a/model/DataList.php
+++ b/model/DataList.php
@@ -658,7 +658,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
*
* Example: Get members from all Groups:
*
- * DataObject::get("Group")->relation("Members")
+ * DataList::Create("Group")->relation("Members")
*
* @param string $relationName
* @return HasManyList|ManyManyList
diff --git a/model/DataObject.php b/model/DataObject.php
index 24c98d805..451a9905b 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -309,7 +309,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
else $passed = "The value '$record'";
user_error("DataObject::__construct passed $passed. It's supposed to be passed an array,
- taken straight from the database. Perhaps you should use DataObject::get_one instead?", E_USER_WARNING);
+ taken straight from the database. Perhaps you should use DataList::create()->First(); instead?", E_USER_WARNING);
$record = null;
}
@@ -2469,10 +2469,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function buildSQL($filter = "", $sort = "", $limit = "", $join = "", $restrictClasses = true, $having = "") {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return $this->extendedSQL($filter, $sort, $limit, $join, $having);
}
@@ -2483,10 +2483,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
private static $cache_buildSQL_query;
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function extendedSQL($filter = "", $sort = "", $limit = "", $join = ""){
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
$dataList = DataObject::get($this->class, $filter, $sort, $join, $limit);
return $dataList->dataQuery()->query();
}
@@ -2521,10 +2521,10 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function Aggregate($class = null) {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
if($class) {
$list = new DataList($class);
@@ -2538,19 +2538,18 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
}
/**
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*/
public function RelationshipAggregate($relationship) {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return $this->$relationship();
}
/**
- * The internal function that actually performs the querying for get().
- * DataObject::get("Table","filter") is the same as singleton("Table")->instance_get("filter")
+ * DataList::create("Table")->where("filter") is the same as singleton("Table")->instance_get("filter")
*
- * @deprecated 3.0 Use DataObject::get and DataList to do your querying
+ * @deprecated 3.0 Use DataList::create and DataList to do your querying
*
* @param string $filter A filter to be inserted into the WHERE clause.
* @param string $sort A sort expression to be inserted into the ORDER BY clause. If omitted, self::$default_sort will be used.
@@ -2561,7 +2560,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return mixed The objects matching the filter, in the class specified by $containerClass
*/
public function instance_get($filter = "", $sort = "", $join = "", $limit="", $containerClass = "DataObjectSet") {
- Deprecation::notice('3.0', 'Use DataObject::get and DataList to do your querying instead.');
+ Deprecation::notice('3.0', 'Use DataList::create and DataList to do your querying instead.');
return self::get($this->class, $filter, $sort, $join, $limit, $containerClass);
}
@@ -2693,7 +2692,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/**
* Does the hard work for get_one()
*
- * @deprecated 3.0 Use DataObject::get_one() instead
+ * @deprecated 3.0 Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead
*
* @uses DataExtension->augmentSQL()
*
@@ -2702,7 +2701,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return DataObject The first item matching the query
*/
public function instance_get_one($filter, $orderby = null) {
- Deprecation::notice('3.0', 'Use DataObject::get_one() instead.');
+ Deprecation::notice('3.0', 'Use DataList::create($this->class)->where($filter)->sort($orderby)->First() instead.');
return DataObject::get_one($this->class, $filter, true, $orderby);
}
diff --git a/model/DataQuery.php b/model/DataQuery.php
index 2dad960fd..03d32c9f3 100644
--- a/model/DataQuery.php
+++ b/model/DataQuery.php
@@ -145,7 +145,7 @@ class DataQuery {
if($this->dataClass != $baseClass) {
// Get the ClassName values to filter to
$classNames = ClassInfo::subclassesFor($this->dataClass);
- if(!$classNames) user_error("DataObject::get() Can't find data sub-classes for '$callerClass'");
+ if(!$classNames) user_error("DataList::create() Can't find data sub-classes for '$callerClass'");
$query->where[] = "\"$baseClass\".\"ClassName\" IN ('" . implode("','", $classNames) . "')";
}
}
diff --git a/model/Versioned.php b/model/Versioned.php
index ce96c9338..fa446fafb 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -1006,7 +1006,7 @@ class Versioned extends DataExtension {
}
/**
- * Return the equivalent of a DataObject::get() call, querying the latest
+ * Return the equivalent of a DataList::create() call, querying the latest
* version of each page stored in the (class)_versions tables.
*
* In particular, this will query deleted records as well as active ones.
diff --git a/scss/AssetUploadField.scss b/scss/AssetUploadField.scss
index df2f25d50..9414a01fe 100644
--- a/scss/AssetUploadField.scss
+++ b/scss/AssetUploadField.scss
@@ -8,6 +8,11 @@
@include box-shadow(none);
}
+body.cms.ss-uploadfield-edit-iframe {
+ padding: $grid-x*2;
+ overflow: auto;
+}
+
.ss-assetuploadfield {
h3 {
border-bottom: 1px solid $color-shadow-light;
@@ -162,7 +167,6 @@
clear: both;
iframe {
- margin: $grid-x*2;
width: 100%;
}
}
diff --git a/scss/GridField.scss b/scss/GridField.scss
index d70194d88..c3cea9f9e 100644
--- a/scss/GridField.scss
+++ b/scss/GridField.scss
@@ -98,6 +98,16 @@ $gf_grid_x: 16px;
tbody {
background: #FFF;
td {
+ // Give browser some hints on which cols take priority:
+ // The last column (buttons) should always shrink to fit.
+ // Overwritten for IE7, which doesn't support this.
+ width: 100%;
+ &.col-buttons {
+ width: auto;
+ text-align: right;
+ white-space: nowrap;
+ }
+
button {
border: none;
background: none;
@@ -118,13 +128,9 @@ $gf_grid_x: 16px;
display:inline-block;
width:$gf_grid_x;
height:20px; //min height to fit the edit icon
- text-indent:-9999em;
+ text-indent:9999em;
background: url(../images/icons/document--pencil.png) no-repeat 0 1px;
}
-
- &.col-buttons {
- white-space: nowrap;
- }
}
}
@@ -265,6 +271,9 @@ $gf_grid_x: 16px;
}
button {
+ &#action_gridfield_relationadd:hover {
+ color: #444 !important; /* Not sure why IE think it needs this */
+ }
&:hover {
color: #ccc !important; /* Not sure why IE think it needs this */
}
diff --git a/security/Group.php b/security/Group.php
index ee52b4521..b4b8fde83 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -85,7 +85,10 @@ class Group extends DataObject {
)
);
- $parentidfield->setRightTitle('' . _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles') . '');
+ $parentidfield->setAttribute(
+ 'title',
+ _t('Group.GroupReminder', 'If you choose a parent group, this group will take all it\'s roles')
+ );
// Filter permissions
// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm
diff --git a/tests/forms/gridfield/GridFieldDeleteActionTest.php b/tests/forms/gridfield/GridFieldDeleteActionTest.php
index 3c09d7b6a..b29196cd8 100644
--- a/tests/forms/gridfield/GridFieldDeleteActionTest.php
+++ b/tests/forms/gridfield/GridFieldDeleteActionTest.php
@@ -31,7 +31,7 @@ class GridFieldDeleteActionTest extends SapphireTest {
// Check that there are content
$this->assertEquals(4, count($content->getBySelector('.ss-gridfield-item')));
// Make sure that there are no delete buttons
- $this->assertEmpty($content->getBySelector('.gridfield-button-delete'), 'Delete buttons should not show when not logged in.');
+ $this->assertEquals(0, count($content->getBySelector('.gridfield-button-delete')), 'Delete buttons should not show when not logged in.');
}
public function testShowDeleteButtonsWithAdminPermission() {
diff --git a/tests/forms/gridfield/GridFieldEditButtonTest.php b/tests/forms/gridfield/GridFieldEditButtonTest.php
index 13b3b045b..10cf20d94 100644
--- a/tests/forms/gridfield/GridFieldEditButtonTest.php
+++ b/tests/forms/gridfield/GridFieldEditButtonTest.php
@@ -32,7 +32,7 @@ class GridFieldEditButtonTest extends SapphireTest {
// Check that there are content
$this->assertEquals(3, count($content->getBySelector('.ss-gridfield-item')));
// Make sure that there are no edit links
- $this->assertEmpty($content->getBySelector('.edit-link'), 'Edit links should not show when not logged in.');
+ $this->assertEquals(0, count($content->getBySelector('.edit-link')), 'Edit links should not show when not logged in.');
}
public function testShowEditLinksWithAdminPermission() {