Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

ENHANCEMENT Tab style consolidation and design consistency #933

Closed
wants to merge 271 commits into from
@chillu
Owner

Relies on silverstripe/silverstripe-cms#230

The tabs in the CMS had quite a bit of "wild growth". What started out as basically two styles (primary and secondary) evolved into a couple of variations which were very similar, but had heaps of copypaste, leading to CSS maintenance issues.

Here's the use cases:

  • "Primary" tabs with darker unselected tabs, directly adjacent to top (can't be nested)
  • "Secondary" tabs with a more common styling, and rounded corners (can be nested)
  • Tabs with text or icons (both primary and secondary)
  • Tabs alongside breadcrumbs (in "Edit Page" view)
  • Tabs alongside dialog title (in "Insert Media" view)
  • Tabs in dialog, but without title (in "My Profile" view) - removed from master

What I've changed:

  • Icons are declarative via generic CSS classes, rather than tied to unrelated classes like .AssetAdmin
  • Same goes for distinction between the two tabset styles. Instead of half a dozen rules scoping to ".CMSPagesController", ".ui-dialog" etc, we just have a ".cms-tabset-primary" class
  • SCSS sprites for icons
  • Dark instead of white text, lighter background for primary unselected tabs, for better contrast and more consistent text display (we rarely use white text anywhere else)
  • Darker background for secondary unselected tabs
  • Corrected text color for selected secondary tabs (was black rather than the main dark-grey we use for text)
  • Right aligned primary and secondary tabs to each other, and the form fields (if window >700px, since form fields have a max-width of 512px)
  • Reduced top padding between primary and secondary tabs
  • Reduced left/right padding of main tabs content area
  • Indented nested secondary tabs
  • Fixed IE7 tab overlap into content

Tested in IE7/IE8/Firefox/Chrome

Comparisons (before/after pairs):

https://www.evernote.com/shard/s5/sh/e570a98d-1ab3-4d14-b3d8-54d97b7e8298/60e20ff1852c4fc83e19e0991608fff7
https://www.evernote.com/shard/s5/sh/a089c5ee-f973-4714-9d18-f76a0d4815a3/1204152c653dabad6ec8a3ff4f06b3c5

https://www.evernote.com/shard/s5/sh/a089c5ee-f973-4714-9d18-f76a0d4815a3/1204152c653dabad6ec8a3ff4f06b3c5
https://www.evernote.com/shard/s5/sh/c4f687eb-0e65-4c75-b142-3a1098961bdd/427d7da6b387b077efc710183921f563

https://www.evernote.com/shard/s5/sh/00be9095-daab-4ac7-8432-a45d3727e1bd/aea4e27cf8d4343814639d769bdee6f4
https://www.evernote.com/shard/s5/sh/2ae92d26-4399-4be7-aa45-7c57fbcc72b3/74f96cd5f6fe7ec357e80acf7aa32b85

https://www.evernote.com/shard/s5/sh/a2068a0d-b84f-434a-bcb8-9cafae14f6d4/393ff3ad195c3eb8adb1b606723d55ad
https://www.evernote.com/shard/s5/sh/54ca3314-25b9-4c98-a218-0e8d6846159a/d875829169c1b7830f5fd9ab9e6c0983

https://www.evernote.com/shard/s5/sh/51df0762-37e9-4711-a1bc-84d3829772c2/88309376e4d21fdf7e4479df685cef97
https://www.evernote.com/shard/s5/sh/8ff4a8d4-f619-494d-8ad2-bb883a3383b4/ba5e2985493eaedcdd471ab84e4b50c3

TeamCity and others added some commits
TeamCity MINOR Updated translations c7f249a
TeamCity MINOR Updated translations 24c0059
TeamCity MINOR Updated translations 18636c4
TeamCity MINOR Updated translations 9460a0a
@chillu chillu API Deprecated Profiler class, removed related debug GET params
Use third party tools like XHProf instead.
Removed defunct or unnecessary debug GET parameters:
debug_profile, debug_memory, profile_trace, debug_javascript, debug_behaviour
0fe515e
@chillu chillu Merge pull request #603 from willrossi/trac7296
FIX: ensure permissions_for_member() accounts for denied permissions
4b9ccab
@chillu chillu Merge pull request #605 from willrossi/trac6648
FIX: insert javascript requirements before the first inline script.
2deb5d6
@chillu chillu Merge pull request #609 from willrossi/trac6672
FIX: improve Director::makeRelative() to ignore  SSL changes.
bc99382
@chillu chillu Merge pull request #618 from chillu/pull/deprecate-profiler
API Deprecated Profiler class, removed related debug GET params
e00c875
@wilr wilr Remove links to our deprecated profiler class and include reference t…
…o third party tutorials
2ee2915
@wilr wilr Fix links in profiling documentation. 7ff2a79
@ajshort ajshort Fixed nested tab styling in other CMS interfaces. 2a9a4be
@chillu
Owner

Oh, good call - overlooked that

chillu and others added some commits
@chillu chillu Merge pull request #625 from ajshort/tabstyling
Fixed nested tab styling in other CMS interfaces.
c37bfc9
TeamCity MINOR Updated translations 9e94046
TeamCity MINOR Updated translations 090c489
Jeremy Bridson BUGFIX:removed text shadow off confirmation message links trac 7637 0ef0c9c
@wilr wilr Merge pull request #627 from silverstripe-rebelalliance/open/7637
Remove text shadow off confirmation message links trac 7637.
b4eb023
@wilr wilr Merge pull request #572 from burnbright/datefield-fix
BUGFIX: DateField javascript fails when it is included in a GroupField
6b611c6
@wilr wilr Merge pull request #595 from fatlewis/master
ENHANCEMENT: Improving Cookie class to allow for extendability
2ac2977
@wilr wilr FIX: resolve errors with commits from (#572) c91e855
TeamCity MINOR Updated translations 21765c4
TeamCity MINOR Updated translations b431f0e
TeamCity MINOR Updated translations a20baab
@unclecheese unclecheese ENHANCEMENT: Hide the search bar in Chosen dropdown fields when list …
…is reasonably short.
6e2d6c2
@chillu chillu Merge pull request #643 from unclecheese/patch-4
ENHANCEMENT: Hide the search bar in Chosen dropdown fields when list is reasonably short.
938bf14
@drzax drzax BUG Attempt to create log path before writing file
Attempt to create the path a log file will be written to before blindly
attempting to write the file. This makes dynamically named log paths
(i.e. rotation by date) possible.
dbc862e
@ajshort ajshort Don't capture form submits to new windows. 9a5baaf
@chillu chillu Merge pull request #648 from ajshort/cms-form-new-window
Don't capture form submits to new windows.
872e2a7
@chillu chillu Merge pull request #645 from drzax/log-writer
BUG Attempt to create log path before writing file
373c25d
@chillu chillu Merge remote-tracking branch 'origin/3.0' 3ae8b0b
@chillu chillu Merge remote-tracking branch 'origin/master' into translation-staging 30ceee4
@chillu chillu MINOR Updated translations master 0394f39
@chillu chillu MINOR Updated translations 74ba3dc
@ajshort ajshort BUG: Allow using instances for search filters.
Previously search filters could only be specified as strings, this
allows instances to be used so more complex filter configuration
can be used.
c058f97
@hafriedlander hafriedlander Merge remote-tracking branch 'origin/3.0' 95d0be6
@hafriedlander hafriedlander MINOR Updated translations eb534e8
TeamCity MINOR Updated translations 7391674
TeamCity MINOR Updated translations cb37515
TeamCity MINOR Updated translations f99e9f8
TeamCity MINOR Updated translations 186fa07
TeamCity MINOR Updated translations 6ca79d0
TeamCity MINOR Updated translations 4d511d9
TeamCity MINOR Updated translations c0ed345
TeamCity MINOR Updated translations ae823b8
TeamCity MINOR Updated translations 24149d9
TeamCity MINOR Updated translations f148c99
TeamCity MINOR Updated translations 3d21c4b
TeamCity MINOR Updated translations 0af767f
@hafriedlander hafriedlander Merge in changes from 3.0.1 final 3efdb5c
@ajshort ajshort Make the list used for autocomplete search results settable.
This is useful if you want to limit the autocomplete results to a subset
of all available objects.
f5b25d2
@wilr wilr Merge pull request #687 from ajshort/gridfield-search-list
Make the list used for autocomplete search results settable.
823f0f7
TeamCity MINOR Updated translations 9020e29
@chillu chillu MINOR Updated translations 0f648cf
TeamCity MINOR Updated translations 04570b8
TeamCity MINOR Updated translations b01db2e
TeamCity MINOR Updated translations d9f9d03
TeamCity MINOR Updated translations 47c59d7
TeamCity MINOR Updated translations 585946e
TeamCity MINOR Updated translations af13a9c
TeamCity MINOR Updated translations ce6c53d
TeamCity MINOR Updated translations 84dc4df
@chillu chillu Merge remote-tracking branch 'origin/3.0' fb70086
@chillu chillu Merge branch '3.0' dfa5547
@chillu chillu Merge branch '3.0' 4eef8e3
@chillu chillu Merge branch '3.0' b69813a
@chillu chillu Merge branch '3.0' cac540d
@chillu chillu Merge branch '3.0' 90fab71
@chillu chillu Updated language master files 24c7cf9
TeamCity MINOR Updated translations d72efcb
TeamCity MINOR Updated translations b4cd019
TeamCity MINOR Updated translations 8975610
TeamCity MINOR Updated translations 47035dd
TeamCity MINOR Updated translations 282be7d
TeamCity MINOR Updated translations 591debb
TeamCity MINOR Updated translations a3280b5
TeamCity MINOR Updated translations 52deb8f
TeamCity MINOR Updated translations ef4e3be
TeamCity MINOR Updated translations 2e92b27
TeamCity MINOR Updated translations a68db46
TeamCity MINOR Updated translations bb1e761
TeamCity MINOR Updated translations fc3bdae
TeamCity MINOR Updated translations 09aab3a
TeamCity MINOR Updated translations d6c2ffe
@chillu chillu Merge remote-tracking branch 'origin/translation-staging' b9bc854
@chillu chillu Merge remote-tracking branch 'origin/3.0' 3bce355
@chillu chillu MINOR Updated translations master b3bda0f
TeamCity MINOR Updated translations 0315807
TeamCity MINOR Updated translations a670d17
@chillu chillu Merge remote-tracking branch 'origin/3.0' 5bfaa65
TeamCity MINOR Updated translations 0bfded9
TeamCity MINOR Updated translations a7169f8
TeamCity MINOR Updated translations c0f75da
@sminnee sminnee Added support for Travis CI 8d92046
@sminnee sminnee Fixed bugs in Travis CI set-up 50b4d80
@sminnee sminnee Make PHPUnit bootstrap add flush=1 4d1c2ed
@sminnee sminnee Fixed Travis CI and make it use SQLite 0e08840
@sminnee sminnee Revert "Make PHPUnit bootstrap add flush=1"
This reverts commit e003796.

Conflicts:

	tests/travis/_ss_environment.php
2dadc77
TeamCity MINOR Updated translations 0e05200
TeamCity MINOR Updated translations ef979df
TeamCity MINOR Updated translations 2cba3e7
Jeremy Bridson BUGFIX: fixed trac 7665 - CMS Menu header now changes height dependin…
…g on the name of the admin and greeting message. position and height were being set inline so added !important to override this.
c621a6d
TeamCity MINOR Updated translations 8f8a469
TeamCity MINOR Updated translations 53043db
@chillu chillu Merge remote-tracking branch 'origin/3.0' 55892fe
TeamCity MINOR Updated translations fc81aa1
TeamCity MINOR Updated translations d897dce
@chillu chillu Merge pull request #589 from simonwelsh/absolute_url
FIX Director::is_absolute_url() now ignores query string
5a2247a
@chillu chillu Merge pull request #659 from ajshort/instance-search-filters
BUG: Allow using instances for search filters.
4598cc0
@sminnee sminnee Exclude a few branches from running in Travis e51937f
TeamCity MINOR Updated translations 38d43b8
TeamCity MINOR Updated translations a921026
@chillu chillu Merge remote-tracking branch 'origin/3.0' 4cc82e9
@chillu chillu Merge remote-tracking branch 'origin/master' into translation-staging 7cfae71
@chillu chillu MINOR Updated translations master 315e84f
TeamCity MINOR Updated translations 80a18b6
TeamCity MINOR Updated translations c2f4f5e
TeamCity MINOR Updated translations 5c78ecf
@sminnee sminnee Updated Travis-CI configuration to have a 3 database build grid. 866d9a9
@sminnee sminnee Added PHP 5.4 + MySQL to build grid 9f4fb13
@sminnee sminnee Fixed bug in Travis exclusion of 5.4/SQlite and 5.4/PostgreSQL 597bc08
@sminnee sminnee Merge branch '3.0' f9b1485
@sminnee sminnee Fixed bug in Travis matrix definition cbdc3bf
TeamCity MINOR Updated translations 0275885
@sminnee sminnee Merge branch '3.0' 824afff
@sminnee sminnee Merge branch '3.0' f1c021f
@simonwelsh simonwelsh NEW Allow arguments to be passed to allowed_action checkers
This allows arguments to be passed along in an $allowed_actions deceleration of
the form 'action' => '->method' in the same way that arguments can be passed to
extension constructors when adding them using $extensions or
Object::add_extension.

I.e. 'action' => '->checkerMethod(false, 7, 2, "yesterday") would call the
checkerMethod method with the boolean false the numbers 7 and 2 and  the string
"yesterday" as its arguments.
f1db583
@simonwelsh simonwelsh FIX Use array_intersect() with expected values so that the order matc…
…hes.

The values in $values aren't returned in any order, so this test can randomly fail. This
changes the check from expected = $values to $values \cap expected = $value. PHP's array_intersect
maintains the keys of the first array, so order is preserved. The intersect also guarentees that the
only accepted values are the expected ones.
cd61b61
@sminnee sminnee Merge pull request #737 from simonwelsh/dotest-fix
FIX Use array_intersect() with expected values so that the order matches
8560cce
TeamCity MINOR Updated translations 094bd2f
TeamCity MINOR Updated translations ee3ca61
TeamCity MINOR Updated translations 931da41
TeamCity MINOR Updated translations 1b0212b
@chillu chillu Merge remote-tracking branch 'origin/translation-staging'
Conflicts:
	lang/de.yml
	lang/mi_NZ.yml
	lang/nl.yml
	lang/ru.yml
6997be6
TeamCity MINOR Updated translations 26200e5
TeamCity MINOR Updated translations 4bad760
TeamCity MINOR Updated translations bf6980c
TeamCity MINOR Updated translations 5aa3226
TeamCity MINOR Updated translations f7bc9b3
@chillu chillu Merge branch '3.0' 30b9fa5
@chillu chillu Merge remote-tracking branch 'origin/master' into translation-staging c191f1f
@chillu chillu Merge remote-tracking branch 'origin/3.0' a8f3353
@chillu chillu Merge remote-tracking branch 'origin/master' into translation-staging db28e88
TeamCity MINOR Updated translations 916b073
TeamCity MINOR Updated translations 276d856
TeamCity MINOR Updated translations a9215ae
TeamCity MINOR Updated translations 9ab3125
TeamCity MINOR Updated translations 877f48a
TeamCity MINOR Updated translations f95e710
@sminnee sminnee Merge branch '3.0' c2afca2
TeamCity Merge remote branch 'origin/master' into translation-staging 378871b
TeamCity MINOR Updated translations 19c995f
@simonwelsh simonwelsh API DataList->leftJoin()/innerJoin() args no longer escaped
The table name in the join was being escaped, though table
names aren't escaped anywhere else. This breaks
namespaced classes, which rely on unescaped backslashes.
78fdcc5
@chillu chillu Merge branch 'aa_function' of git://github.com/simonwelsh/silverstrip…
…e-framework into simonwelsh-aa_function
a71077c
TeamCity Merge remote branch 'origin/master' into translation-staging fbaf743
TeamCity MINOR Updated translations 2b0569f
TeamCity MINOR Updated translations da95c74
TeamCity MINOR Updated translations e4ab0e5
TeamCity MINOR Updated translations 25ca702
TeamCity MINOR Updated translations 56d9503
TeamCity MINOR Updated translations 27d5dbd
TeamCity MINOR Updated translations 8075560
TeamCity MINOR Updated translations f62cf39
TeamCity MINOR Updated translations 0c6c6c0
@chillu chillu Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
1088d04
@chillu chillu Merge remote-tracking branch 'origin/translation-staging' 5bf2212
TeamCity MINOR Updated translations 4dfeb91
TeamCity MINOR Updated translations 02c0a0f
TeamCity MINOR Updated translations 3d2057a
TeamCity MINOR Updated translations fa9981c
TeamCity MINOR Updated translations 2b04f2d
TeamCity MINOR Updated translations 5c26eb7
@sminnee sminnee NEW: Added support for PHP 5.4's built-in webserver.
PHP 5.4 comes with a built-in webserver.  This addition to main.php adds support for it.  It is designed to be run like so:

php -S localhost:3000 framework/main.php

The router will pass access of any file back to the built-in webserver, and handle all other URLs.
1005571
@halkyon halkyon Merge pull request #781 from sminnee/php54-webserver-support
NEW: Added support for PHP 5.4's built-in webserver.
f33c98d
TeamCity Merge remote branch 'origin/master' into translation-staging 78a052b
TeamCity MINOR Updated translations 411ad8e
@chillu chillu Merge remote-tracking branch 'origin/3.0' 6544c8f
@chillu chillu Updated translations cb7bf79
@halkyon halkyon Fixed link to RC3 changelog b6c1a64
@halkyon halkyon Merge branch '3.0' 9c2be0f
Jeremy Bridson ENHANCEMENT:open/7875 - added help labels to metadata fields on page …
…content edit screen.
a670e4c
@simonwelsh simonwelsh Merge branch '3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
1e629f4
@simonwelsh simonwelsh API Allow subgroups in the WHERE clause of a Data/SQLQuery
Adds three extra methods to Data/SQLQuery query that allow for starting
a disjunctive subgroup, a conjunctive subgroup and for ending a subgroup.

Database::sqlWhereToString() now builds up the WHERE clause one by one
instead of with a straight implode. Uses a stack to know which conenctive
to use.
6d696d5
@wilr wilr API: Remove static main and dev/buildcache
Files moved to a separate module (silverstripe-static).
e72114d
@chillu chillu Merge branch 'open/7875' of git://github.com/jbridson/sapphire into j…
…bridson-open/7875
039b402
@chillu chillu Removed SiteTree.MetaTitle and MetaKeywords usage 5df519c
@Zauberfisch Zauberfisch MINOR: HTTPRequest and HTTPResponse now return $this on all setters
MINOR: also added some docs
7f1b6cf
@chillu chillu Merge pull request #814 from Zauberfisch/master
HTTPRequest and HTTPResponse now return $this on all setters
cc702df
@sminnee sminnee Merge pull request #808 from simonwelsh/stack-sqlquery
API Allow subgroups in the WHERE clause of a Data/SQLQuery
200f184
@simonwelsh simonwelsh FIX Output the title of the task instead of Array when listing in the…
… CLI
0470219
@halkyon halkyon Merge pull request #811 from wilr/removestatic
API: Remove static main and dev/buildcache
2654290
@halkyon halkyon Merge pull request #812 from chillu/pull/sitetree-meta-removal
Removed SiteTree.MetaTitle and MetaKeywords usage
92e62eb
@howardgrigg howardgrigg API FormField::name_to_label() for unlabelled fields
Will convert camel case to spaces, e.g. "TotalAmount"
to "Total Amount".
aa6f345
@halkyon halkyon Merge branch '3.0' e4ab02e
@halkyon halkyon Fixing broken FulltextSearchableTest e9ce89e
@sminnee sminnee API: Added 'onBeforeHTTPError' and 'onBeforeHTTPError<code>' extensio…
…n points to RequestHandler::httpError().

These APIs are primarily intended to let developers write custom 404 handlers.  They can define an onBeforeHTTPError404() method on an Extension that gets added to Controller or RequestHandler.

The SS_HTTPResponse_Exception object has also been tidied up to override the status info of any SS_HTTPResponse object that might get passed.  This is mainly to make it easier for callers (such as ContentController and ModelAsController) to use RequestHandler::httpError() more consistently.
39952f4
@simonwelsh simonwelsh Merge pull request #827 from sminnee/http-error-catching
API: Added 'onBeforeHTTPError' and 'onBeforeHTTPError<code>' extension p...
7bd36eb
@chillu chillu Merge remote-tracking branch 'origin/3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
56f7ce1
@chillu chillu Line length fixes fb5e488
@simonwelsh simonwelsh Merge branch '3.0' 5768e42
Jeremy Bridson ENHANCEMENT: open/7886 added preview button to the settings page so t…
…hat when a user changes the theme they can preview the change.
ad7383a
@phalkunz phalkunz CMS member profile now is no longer in a popup (#7880) e3a27ea
@chillu chillu Merge remote-tracking branch 'origin/3.0' d1ee761
@chillu chillu NEW Enable SiteTree::$nested_urls by default 38e7df2
@simonwelsh simonwelsh API Add exclude() method to SearchFilters that excludes items that ma…
…tch the filter.
79b3f8a
@simonwelsh simonwelsh API Allow using SearchFilters in DataList::exclude() 2faf7d1
@chillu chillu Merge remote-tracking branch 'origin/3.0' e9cf4af
@simonwelsh simonwelsh API Allow use of :not, :nocase and :case modifiers to SearchFilters.
More modifiers can be added to each class as desired.
c49f756
@sminnee sminnee Merge pull request #775 from simonwelsh/exclude-filter
Exclude filter
7023669
@chillu chillu NEW DataList->filterAny() 5be3a4c
@chillu chillu API File->canEdit() returns TRUE by default (not checking CMS perms)
This is a measure to support form fields and controllers
interacting with files in different contexts,
for example an UploadField used in a ModelAdmin,
or a website frontend. The check for 'CMS_ACCESS_AssetAdmin'
was too restricting. This wasn't a problem in 2.x simply because
the old FileField/Upload classes didn't respect File->can*()
permissions.
a3295e2
@halkyon halkyon Merge branch '3.0' f6a9046
@chillu chillu Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
1181ba0
@chillu chillu Added 2.4.8-rc1 changelog f365134
@icecaster icecaster fixed empty string always on scaffolded enum fields 8a7f9ed
@chillu chillu Merge pull request #884 from icecaster/master
Fix: scaffolded Enum dropdown field always returning empty string
ee3954d
@adrexia adrexia Remove sub navigation for "Files" (fixes 7956) 84851c9
@simonwelsh simonwelsh Merge branch '3.0' bedb579
@wilr wilr Merge pull request #890 from adrexia/7956-remove-files-subnav
Remove sub navigation for "Files" (fixes 7956)
1692a10
@wilr wilr Merge pull request #719 from silverstripe-rebelalliance/open/7665
FIX: CMS Menu header now changes height (Fixes: 7665)
d7bf6e7
@chillu chillu Merge remote-tracking branch 'origin/3.0'
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	security/Member.php
efabde1
@chillu chillu Fixed merge errors in CMSProfileController 0883226
@chillu chillu API Removed permission checks from XML/JSON data formatters
Please handle those checks in the logic using the formatters
instead. Applied permission checks to its primary use case,
the "restfulserver" module.
d54b1b4
@adrexia adrexia BUG: One too many brackets in _style.scss
Caused when merging 3.0 back into master
2a67715
@chillu chillu Merge pull request #913 from adrexia/fix-style-scss
BUG: One too many brackets in _style.scss
c090b31
@adrexia adrexia BUG: Site Tree checkboxes and refactoring
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
eb23f50
@chillu chillu Merge pull request #908 from chillu/pulls/xmldataformatter-canview
API Removed permission checks from XML/JSON data formatters
48b9331
@chillu chillu Merge pull request #914 from adrexia/refactor-sitetree
BUG:  Site Tree checkboxes and refactoring
18d691b
@chillu chillu Added composer.json 43cd54b
@adrexia adrexia BUG: File Uploading Notifications (fixes #7883)
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2dabaeb
@TheFrozenFire TheFrozenFire BUG: DataObject::__construct() now accepts stdClass for $record a651d73
@adrexia adrexia BUG: GridField add existing auto complete has no max height (fixes #7…
…965)

Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
95b5f65
@chillu chillu Merge pull request #918 from adrexia/7965-autocomplete
BUG: GridField add existing auto complete has no max height (fixes #7965)
de987b0
@chillu chillu Merge pull request #880 from adrexia/fileoverview
BUG: File Uploading Notifications (fixes #7883)
70352fb
@simonwelsh simonwelsh Merge pull request #870 from chillu/pulls/datalist-filterany
NEW DataList->filterAny()
8a0f234
@TheFrozenFire TheFrozenFire NEW: Add new method "each" to SS_List and core implementors thereof 26e5afc
@TheFrozenFire TheFrozenFire BUG: DataObject::write overwrites Created on first write f2a709d
@simonwelsh simonwelsh Merge pull request #921 from TheFrozenFire/bug-DataObjectCreated
BUG: DataObject::write overwrites Created on first write
5a79399
@simonwelsh simonwelsh Merge pull request #920 from TheFrozenFire/feature-SSListEach
API: Add new method "each" to SS_List
123a742
@simonwelsh simonwelsh Merge pull request #917 from TheFrozenFire/feature-DataObjectFromStdC…
…lass

API: DataObject::__construct() now accepts stdClass for $record
d8c9202
@TheFrozenFire TheFrozenFire NEW: Enable multiple image manipulation back-ends on the Image class d24b586
@adrexia adrexia BUG: Border at top of tabs when no subtabs
This bug reappeared when branches were merged because the 3.0 version
of _style.scss had tabsets defined in different places.

This scss was inserted, but there was no idication that it was new to
master (except in the resulting css file). As these styles are declared
differently elsewhere in _style.scss, I think this declaration must
have been refactored in an earlier commit in master.
7ae73ea
@chillu chillu Merge pull request #925 from adrexia/tabs-remove-line
BUG: Border at top of tabs when no subtabs
6bb7a95
@halkyon halkyon Merge branch '3.0' fbc6e33
@halkyon halkyon Merge pull request #872 from chillu/pulls/file-permission
API File->canEdit() returns TRUE by default (not checking CMS perms)
0f55a11
@sminnee sminnee Merge pull request #898 from TheFrozenFire/feature-ImageBackend
ENHANCEMENT: Enable multiple image manipulation back-ends on the Image class
0238db4
@clarkepaul clarkepaul ENHANCEMENT general css enhancements
Remove arrow from sitetree next to site name  #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
411673e
@sminnee sminnee Merge pull request #930 from clarkepaul/master
ENHANCEMENT general interface enhancements
3fb3dc4
@halkyon halkyon Merge branch '3.0' 169366a
@chillu chillu referenced this pull request in silverstripe/silverstripe-cms
Closed

ENHANCEMENT Tab style consolidation and design consistency #230

@chillu
Owner

@clarkepaul This pull request contains some (subtle) design changes, could you please have a look?

@sminnee
Owner

Could we create or edit a "creating admin UIs" doc page that explains how to instantiate the different kind of tabs?

@chillu
Owner

Can't move an existing pull request form 3.0 to master, so reopening

@chillu chillu closed this
@clarkepaul

Great work, I'm glad you got rid of the white text, and the non-active tab colour works much better too. The only thing that I noticed straight away is the different width's of the second and third tab sets border on the bottom but I'm sure your already aware of that. +1 from me

@chillu
Owner

See #934

@chillu
Owner

Hey Will, thanks for helping us clean up core with deprecations! But when you do that, please also fix any usage of the deprecated methods. I've just come across multiple deprecated forceExpiry() calls in core :/

Collaborator

Thanks, will keep that in mind. Though I normally do a grep on a full installer with modules before doing any API changes to pick those things up. I wonder if another commit got lost in translation.

@sminnee
Owner

@chillu or @hafriedlander - FrozenFire has asked for this in the 3.0 branch. Seems pretty safe to me; any concern?

Owner

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.