diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index a58fb4c6a..d139e9500 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -280,7 +280,6 @@ class LeftAndMain extends Controller { 'sapphire/admin/javascript/LeftAndMain.js', 'sapphire/javascript/tree/tree.js', 'sapphire/javascript/TreeDropdownField.js', - 'cms/javascript/ThumbnailStripField.js', ) ); @@ -1035,13 +1034,10 @@ class LeftAndMain extends Controller { * @return string */ public function CMSVersion() { - $sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version'); - $cmsVersionFile = file_get_contents(BASE_PATH . '/cms/silverstripe_version'); - + $sapphireVersionFile = file_get_contents(BASE_PATH . '/sapphire/silverstripe_version'); $sapphireVersion = $this->versionFromVersionFile($sapphireVersionFile); - $cmsVersion = $this->versionFromVersionFile($cmsVersionFile); - return "cms: $cmsVersion, sapphire: $sapphireVersion"; + return "sapphire: $sapphireVersion"; } /** diff --git a/admin/css/cms_right.css b/admin/css/cms_right.css index 64433c801..661e5449f 100644 --- a/admin/css/cms_right.css +++ b/admin/css/cms_right.css @@ -585,6 +585,6 @@ } #UploadFormResponse.loading .loading#UploadFormResponse { - background: url(../images/network-save.gif) no-repeat left center; + background: url(../../images/network-save.gif) no-repeat left center; padding-left: 20px; } \ No newline at end of file diff --git a/admin/css/layout.css b/admin/css/layout.css index 79e6e24bd..9029d2543 100644 --- a/admin/css/layout.css +++ b/admin/css/layout.css @@ -197,7 +197,7 @@ body { input.action.loading, input.action.loading:hover { padding-left: 22px !important; - background: url(../images/network-save.gif) 3px 2px no-repeat; + background: url(../../images/network-save.gif) 3px 2px no-repeat; } input.delete:hover, @@ -209,7 +209,7 @@ button.delete:hover, input.loading { padding-left: 16px; - background: #fff url(../images/network-save.gif) no-repeat center left; + background: #fff url(../../images/network-save.gif) no-repeat center left; } input.hidden { @@ -654,7 +654,7 @@ iframe { display: block; width: 20px; height: 20px; - background: transparent url(../../../cms/images/arrow_refresh.gif) no-repeat; + background: transparent url(../images/arrow_refresh.gif) no-repeat; } #Form_EditorToolbarLinkForm select.hasRefreshButton { diff --git a/admin/images/arrow_refresh.gif b/admin/images/arrow_refresh.gif new file mode 100644 index 000000000..70941393f Binary files /dev/null and b/admin/images/arrow_refresh.gif differ diff --git a/admin/images/network-save.gif b/admin/images/network-save.gif deleted file mode 100644 index 1560b646c..000000000 Binary files a/admin/images/network-save.gif and /dev/null differ diff --git a/admin/javascript/AssetTableField.js b/admin/javascript/AssetTableField.js index 4966ea6c1..1bf5b87ba 100644 --- a/admin/javascript/AssetTableField.js +++ b/admin/javascript/AssetTableField.js @@ -138,7 +138,7 @@ AssetTableField.prototype = { var confirmed = confirm(confirmMessage); if(confirmed) { - img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work + img.setAttribute("src",'sapphire/admin/images/network-save.gif'); // TODO doesn't work new Ajax.Request( link.getAttribute("href"), { diff --git a/admin/javascript/MemberTableField.js b/admin/javascript/MemberTableField.js index fcb091d51..c47816cff 100755 --- a/admin/javascript/MemberTableField.js +++ b/admin/javascript/MemberTableField.js @@ -226,7 +226,7 @@ MemberTableField.prototype = { if(typeof groupId == 'undefined') var groupId = $('Form_EditForm').elements.ID.value; cell = document.createElement('td') - cell.innerHTML = 'delete'; + cell.innerHTML = 'delete'; cell.getElementsByTagName('0'); row.appendChild(cell); diff --git a/admin/templates/Includes/MemberTableField.ss b/admin/templates/Includes/MemberTableField.ss index fa8175d39..9796a93a2 100755 --- a/admin/templates/Includes/MemberTableField.ss +++ b/admin/templates/Includes/MemberTableField.ss @@ -32,7 +32,7 @@ - add<% _t('ADDNEW','Add new',50,'Followed by a member type') %> $Title + add<% _t('ADDNEW','Add new',50,'Followed by a member type') %> $Title <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> diff --git a/admin/tests/LeftAndMainTest.php b/admin/tests/LeftAndMainTest.php index f9d8177eb..af592c3aa 100644 --- a/admin/tests/LeftAndMainTest.php +++ b/admin/tests/LeftAndMainTest.php @@ -88,17 +88,17 @@ class LeftAndMainTest extends FunctionalTest { public function testCMSVersion() { $l = new LeftAndMain(); $this->assertEquals("2.4", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/branches/2.4/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/branches/2.4/silverstripe_version $')); $this->assertEquals("2.2.0", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/2.2.0/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/2.2.0/silverstripe_version $')); $this->assertEquals("trunk", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/trunk/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/trunk/silverstripe_version $')); $this->assertEquals("2.4.0-alpha1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/alpha/2.4.0-alpha1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/alpha/2.4.0-alpha1/silverstripe_version $')); $this->assertEquals("2.4.0-beta1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/beta/2.4.0-beta1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/beta/2.4.0-beta1/silverstripe_version $')); $this->assertEquals("2.4.0-rc1", $l->versionFromVersionFile( - '$URL: http://svn.silverstripe.com/open/modules/cms/tags/rc/2.4.0-rc1/silverstripe_version $')); + '$URL: http://svn.silverstripe.com/open/modules/sapphire/tags/rc/2.4.0-rc1/silverstripe_version $')); } /** diff --git a/css/ComplexTableField_popup.css b/css/ComplexTableField_popup.css index e3874cd6a..c0cca3048 100755 --- a/css/ComplexTableField_popup.css +++ b/css/ComplexTableField_popup.css @@ -10,7 +10,7 @@ body { } #ComplexTableField_Popup_DetailForm input.loading { - background: #fff url(../../cms/images/network-save.gif) left center no-repeat; + background: #fff url(../images/network-save.gif) left center no-repeat; padding-left: 16px; } diff --git a/css/Form.css b/css/Form.css index 7c683d1ce..be5aa3020 100644 --- a/css/Form.css +++ b/css/Form.css @@ -70,7 +70,7 @@ form button.minorAction { background: none; padding: 0; border: 0; - color: #0074C6; /* same for "a" tag in cms/css/typography.css */ + color: #0074C6; text-decoration: underline; } diff --git a/css/TableListField.css b/css/TableListField.css index ac2e8608f..8bb39c63b 100644 --- a/css/TableListField.css +++ b/css/TableListField.css @@ -33,7 +33,7 @@ table.CMSList th { table.TableField thead th, .TableListField table.data thead th, table.CMSList thead th { - background-image: url(../../cms/images/tables/thead.png); + background-image: url(../images/thead.png); background-repeat: repeat-x; background-position: left bottom; background-color: #ebeadb; @@ -105,7 +105,7 @@ table.TableField tbody td.checkbox, table.CMSList tbody td.checkbox { border : 1px solid #f1efe2; padding-left : 5px; - background-image : url(../../cms/images/tables/checkbox.png); + background-image : url(../images/checkbox.png); background-repeat : repeat-x; background-position : left bottom; } @@ -143,7 +143,7 @@ table.CMSList tbody td.current td { */ .TableListField tr.loading td.first { padding-left: 22px; - background: url(../../cms/images/network-save.gif) 3px 2px no-repeat; + background: url(../images/network-save.gif) 3px 2px no-repeat; } .right form .TableField span.readonly { diff --git a/dev/install/config-form.html b/dev/install/config-form.html index a0d8ade26..a767badd6 100644 --- a/dev/install/config-form.html +++ b/dev/install/config-form.html @@ -270,7 +270,7 @@

diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php index 19c24c52f..c249645eb 100644 --- a/forms/ComplexTableField.php +++ b/forms/ComplexTableField.php @@ -138,20 +138,20 @@ class ComplexTableField extends TableListField { public $actions = array( 'show' => array( 'label' => 'Show', - 'icon' => 'cms/images/show.png', - 'icon_disabled' => 'cms/images/show_disabled.png', + 'icon' => 'sapphire/images/show.png', + 'icon_disabled' => 'sapphire/images/show_disabled.png', 'class' => 'popuplink showlink', ), 'edit' => array( 'label' => 'Edit', - 'icon' => 'cms/images/edit.gif', - 'icon_disabled' => 'cms/images/edit_disabled.gif', + 'icon' => 'sapphire/images/edit.gif', + 'icon_disabled' => 'sapphire/images/edit_disabled.gif', 'class' => 'popuplink editlink', ), 'delete' => array( 'label' => 'Delete', - 'icon' => 'cms/images/delete.gif', - 'icon_disabled' => 'cms/images/delete_disabled.gif', + 'icon' => 'sapphire/images/delete.gif', + 'icon_disabled' => 'sapphire/images/delete_disabled.gif', 'class' => 'popuplink deletelink', ), ); diff --git a/forms/FileIFrameField.php b/forms/FileIFrameField.php index ffb912069..098637e20 100755 --- a/forms/FileIFrameField.php +++ b/forms/FileIFrameField.php @@ -107,7 +107,6 @@ class FileIFrameField extends FileField { Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript('sapphire/javascript/FileIFrameField.js'); - Requirements::css('cms/css/typography.css'); Requirements::css('sapphire/css/FileIFrameField.css'); return $this->renderWith('FileIFrameField'); diff --git a/forms/TableListField.php b/forms/TableListField.php index 9db0a2f66..b2bec1116 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -117,8 +117,8 @@ class TableListField extends FormField { * array( * 'delete' => array( * 'label' => 'Delete', - * 'icon' => 'cms/images/delete.gif', - * 'icon_disabled' => 'cms/images/delete_disabled.gif', + * 'icon' => 'sapphire/images/delete.gif', + * 'icon_disabled' => 'sapphire/images/delete_disabled.gif', * 'class' => 'deletelink', * ) * ) @@ -126,8 +126,8 @@ class TableListField extends FormField { public $actions = array( 'delete' => array( 'label' => 'Delete', - 'icon' => 'cms/images/delete.gif', - 'icon_disabled' => 'cms/images/delete_disabled.gif', + 'icon' => 'sapphire/images/delete.gif', + 'icon_disabled' => 'sapphire/images/delete_disabled.gif', 'class' => 'deletelink' ) ); diff --git a/images/bullet_arrow_down.png b/images/bullet_arrow_down.png new file mode 100755 index 000000000..7f33a1e10 Binary files /dev/null and b/images/bullet_arrow_down.png differ diff --git a/images/bullet_arrow_up.png b/images/bullet_arrow_up.png new file mode 100755 index 000000000..af5639c41 Binary files /dev/null and b/images/bullet_arrow_up.png differ diff --git a/images/checkbox.png b/images/checkbox.png new file mode 100755 index 000000000..71fbdd3b1 Binary files /dev/null and b/images/checkbox.png differ diff --git a/images/delete.gif b/images/delete.gif new file mode 100644 index 000000000..27dfea12f Binary files /dev/null and b/images/delete.gif differ diff --git a/images/delete_disabled.gif b/images/delete_disabled.gif new file mode 100644 index 000000000..0e769c075 Binary files /dev/null and b/images/delete_disabled.gif differ diff --git a/images/edit.gif b/images/edit.gif new file mode 100755 index 000000000..c0e3d387f Binary files /dev/null and b/images/edit.gif differ diff --git a/images/edit_disabled.gif b/images/edit_disabled.gif new file mode 100644 index 000000000..9e504000f Binary files /dev/null and b/images/edit_disabled.gif differ diff --git a/images/pagination/record-export.png b/images/pagination/record-export.png new file mode 100755 index 000000000..dd34cf6e5 Binary files /dev/null and b/images/pagination/record-export.png differ diff --git a/images/pagination/record-first-g.png b/images/pagination/record-first-g.png new file mode 100755 index 000000000..a3bfef6de Binary files /dev/null and b/images/pagination/record-first-g.png differ diff --git a/images/pagination/record-first.png b/images/pagination/record-first.png new file mode 100755 index 000000000..a1a52cc4c Binary files /dev/null and b/images/pagination/record-first.png differ diff --git a/images/pagination/record-last-g.png b/images/pagination/record-last-g.png new file mode 100755 index 000000000..ede7e36c4 Binary files /dev/null and b/images/pagination/record-last-g.png differ diff --git a/images/pagination/record-last.png b/images/pagination/record-last.png new file mode 100755 index 000000000..68448e35d Binary files /dev/null and b/images/pagination/record-last.png differ diff --git a/images/pagination/record-next-g.png b/images/pagination/record-next-g.png new file mode 100755 index 000000000..f48422920 Binary files /dev/null and b/images/pagination/record-next-g.png differ diff --git a/images/pagination/record-next.png b/images/pagination/record-next.png new file mode 100755 index 000000000..f6c055063 Binary files /dev/null and b/images/pagination/record-next.png differ diff --git a/images/pagination/record-prev-g.png b/images/pagination/record-prev-g.png new file mode 100755 index 000000000..432558ad5 Binary files /dev/null and b/images/pagination/record-prev-g.png differ diff --git a/images/pagination/record-prev.png b/images/pagination/record-prev.png new file mode 100755 index 000000000..951e5229a Binary files /dev/null and b/images/pagination/record-prev.png differ diff --git a/images/pagination/record-print.png b/images/pagination/record-print.png new file mode 100755 index 000000000..02926897c Binary files /dev/null and b/images/pagination/record-print.png differ diff --git a/images/show.png b/images/show.png new file mode 100755 index 000000000..921d07752 Binary files /dev/null and b/images/show.png differ diff --git a/images/show_disabled.png b/images/show_disabled.png new file mode 100644 index 000000000..f3c1191a2 Binary files /dev/null and b/images/show_disabled.png differ diff --git a/images/thead.png b/images/thead.png new file mode 100755 index 000000000..7a46a7151 Binary files /dev/null and b/images/thead.png differ diff --git a/javascript/TableField.js b/javascript/TableField.js index a247e37b9..09fc99d56 100755 --- a/javascript/TableField.js +++ b/javascript/TableField.js @@ -77,7 +77,7 @@ TableField.prototype = { // TODO ajaxErrorHandler and loading-image are dependent on cms, but formfield is in sapphire var confirmed = confirm(ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?')); if(confirmed){ - img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work + img.setAttribute("src",'sapphire/images/network-save.gif'); // TODO doesn't work jQuery.ajax({ 'url': link.getAttribute("href"), 'method': 'post', diff --git a/javascript/TableListField.js b/javascript/TableListField.js index 87f058a21..6079311ad 100755 --- a/javascript/TableListField.js +++ b/javascript/TableListField.js @@ -93,7 +93,7 @@ TableListField.prototype = { var confirmed = confirm(ss.i18n._t('TABLEFIELD.DELETECONFIRMMESSAGE', 'Are you sure you want to delete this record?')); if(confirmed) { - img.setAttribute("src",'cms/images/network-save.gif'); // TODO doesn't work + img.setAttribute("src",'sapphire/images/network-save.gif'); // TODO doesn't work jQuery.ajax({ 'url': link.getAttribute("href"), 'method': 'post', diff --git a/javascript/tree/tree.css b/javascript/tree/tree.css index 0252a8d2a..860884988 100644 --- a/javascript/tree/tree.css +++ b/javascript/tree/tree.css @@ -179,29 +179,29 @@ ul.tree span.a.current { } ul.tree span.a.loading span.b span.c a { - background-image: url(../../../cms/images/network-save.gif) !important; + background-image: url(../../images/network-save.gif) !important; margin-left: -3px; padding-left: 21px; background-position : 2px 2px; } ul.tree.multiselect span.a span.b a { - background-image: url(../../../cms/images/tickbox-unticked.gif) !important; + background-image: url(../../images/tickbox-unticked.gif) !important; } ul.tree.multiselect span.a.nodelete span.b a { - background-image: url(../../../cms/images/tickbox-canttick.gif) !important; + background-image: url(../../images/tickbox-canttick.gif) !important; } ul.tree.multiselect span.a.treeloading span.b a { - background-image: url(../../../cms/images/tickbox-greyedout.gif) !important; + background-image: url(../../images/tickbox-greyedout.gif) !important; } ul.tree.multiselect span.a.failed span.b a { - background-image: url(../../../cms/images/tickbox-fail.gif) !important; + background-image: url(../../images/tickbox-fail.gif) !important; } ul.tree.multiselect span.a.selected span.b span.c a { - background-image: url(../../../cms/images/tickbox-ticked.gif) !important; + background-image: url(../../images/tickbox-ticked.gif) !important; } /* Span-B: Plus/Minus icon */ diff --git a/templates/ComplexTableField.ss b/templates/ComplexTableField.ss index 773e7735f..2d0e7c21d 100644 --- a/templates/ComplexTableField.ss +++ b/templates/ComplexTableField.ss @@ -17,9 +17,9 @@ <% if SortDirection = desc %> - <% _t('SORTASC', 'Sort ascending') %> + <% _t('SORTASC', 'Sort ascending') %> <% else %> - <% _t('SORTDESC', 'Sort descending') %> + <% _t('SORTDESC', 'Sort descending') %> <% end_if %>   @@ -49,7 +49,7 @@ - <% _t('ADDITEM', 'add') %> + <% _t('ADDITEM', 'add') %> <% sprintf(_t('ADDITEM', 'Add %s', PR_MEDIUM, 'Add [name]'),$Title) %> diff --git a/templates/ComplexTableField_popup.ss b/templates/ComplexTableField_popup.ss index 5a47bbe53..d384b3710 100755 --- a/templates/ComplexTableField_popup.ss +++ b/templates/ComplexTableField_popup.ss @@ -15,7 +15,7 @@ <% if Paginator.PrevLink %> - <% _t('PREVIOUS', 'Previous') %> + <% _t('PREVIOUS', 'Previous') %> <% end_if %> <% if xdsfdsf %> @@ -32,7 +32,7 @@ <% end_if %> <% if Paginator.NextLink %> - <% _t('NEXT', 'Next') %> + <% _t('NEXT', 'Next') %> <% end_if %> diff --git a/templates/Includes/TableListField_PageControls.ss b/templates/Includes/TableListField_PageControls.ss index bd66c2bc3..d22642eb8 100755 --- a/templates/Includes/TableListField_PageControls.ss +++ b/templates/Includes/TableListField_PageControls.ss @@ -1,17 +1,17 @@ <% if ShowPagination %> <% if TotalCount %>
- <% if FirstLink %><% _t('VIEWFIRST', 'View first') %> $PageSize - <% else %><% _t('VIEWFIRST', 'View first') %> $PageSize<% end_if %> - <% if PrevLink %> - <% else %><% _t('VIEWPREVIOUS', 'View previous') %> $PageSize<% end_if %> + <% if FirstLink %><% _t('VIEWFIRST', 'View first') %> $PageSize + <% else %><% _t('VIEWFIRST', 'View first') %> $PageSize<% end_if %> + <% if PrevLink %> + <% else %><% _t('VIEWPREVIOUS', 'View previous') %> $PageSize<% end_if %> <% _t('DISPLAYING', 'Displaying') %> $FirstItem <% _t('TO', 'to') %> $LastItem <% _t('OF', 'of') %> $TotalCount - <% if NextLink %> - <% else %><% _t('VIEWNEXT', 'View next') %> $PageSize<% end_if %> - <% if LastLink %><% _t('VIEWLAST', 'View last') %> $PageSize - <% else %><% _t('VIEWLAST', 'View last') %> $PageSize<% end_if %> + <% if NextLink %> + <% else %><% _t('VIEWNEXT', 'View next') %> $PageSize<% end_if %> + <% if LastLink %><% _t('VIEWLAST', 'View last') %> $PageSize + <% else %><% _t('VIEWLAST', 'View last') %> $PageSize<% end_if %>
<% end_if %> diff --git a/templates/RelationComplexTableField.ss b/templates/RelationComplexTableField.ss index a8b78fac4..c4127528e 100644 --- a/templates/RelationComplexTableField.ss +++ b/templates/RelationComplexTableField.ss @@ -34,7 +34,7 @@ - <% _t('ADD', 'Add') %><% _t('ADD', 'Add') %> $Title + <% _t('ADD', 'Add') %><% _t('ADD', 'Add') %> $Title <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> diff --git a/templates/TableField.ss b/templates/TableField.ss index 9dd43debe..2792e2172 100755 --- a/templates/TableField.ss +++ b/templates/TableField.ss @@ -30,7 +30,7 @@ <% if Can(add) %> - <% _t('ADD','Add a new row') %> + <% _t('ADD','Add a new row') %> <% sprintf(_t('ADDITEM','Add %s'),$Title) %> @@ -47,7 +47,7 @@ $Field <% end_control %> $ExtraData - <% if Can(delete) %><% _t('DELETE') %><% end_if %> + <% if Can(delete) %><% _t('DELETE') %><% end_if %> <% end_control %> <% else %> diff --git a/templates/TableListField.ss b/templates/TableListField.ss index 0d4e834ea..554bbaf32 100755 --- a/templates/TableListField.ss +++ b/templates/TableListField.ss @@ -24,9 +24,9 @@ <% if SortDirection = desc %> - <% _t('SORTDESC', 'Sort in descending order') %> + <% _t('SORTDESC', 'Sort in descending order') %> <% else %> - <% _t('SORTASC', 'Sort in ascending order') %> + <% _t('SORTASC', 'Sort in ascending order') %> <% end_if %>   diff --git a/thirdparty/greybox/greybox.css b/thirdparty/greybox/greybox.css index fdb850064..e267522f1 100644 --- a/thirdparty/greybox/greybox.css +++ b/thirdparty/greybox/greybox.css @@ -22,11 +22,8 @@ } .GB_header { - /*border-bottom: 1px solid #ccc;*/ border-bottom: 3px solid #CCDEF3; - /*background: #000 url(../../cms/images/textures/obar-18.gif) repeat-x;*/ - background: #ccdef3 url(../../cms/images/mainmenu/current.gif) repeat-x; - /*color: #fff;*/ + background: #ccdef3 url(../../admin/images/mainmenu/current.gif) repeat-x; color: #555; }