Commit Graph

1131 Commits

Author SHA1 Message Date
Loz Calver
9a1ccd8a67 FIX: Prevent opening preview when clicking the link for current page again 2013-03-01 11:42:34 +00:00
Ingo Schommer
64b465f0cb Merge pull request #1143 from svandragt/3.1
ENHANCEMENT Sort menu items according to priority descending, then title ascending
2013-02-27 01:25:49 -08:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/HTTP.php
2013-02-26 13:28:35 +01:00
Ingo Schommer
25af4adce2 Merge tag '3.0.5' into 3.0 2013-02-20 02:21:41 +01:00
roed
9e7c622abe fixed error property $ of object is not a function
changed $ to jQuery, because without it the system would generate the following error:

Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 15:48:29 +01:00
roed
396af557df fixed error property $ of object is not a function
changed $ to jQuery, because without it the system would generate the following error:

Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 09:20:29 +01:00
Ingo Schommer
0c6ac1960e Fixed whitespace usage 2013-02-18 15:43:52 +01:00
Ingo Schommer
a86e4ee00c Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/injector/InjectorTest.php
	tests/travis/before_script
2013-02-18 14:15:42 +01:00
ARNHOE
924c76ccb1 Create nl_NL.js 2013-02-18 03:13:09 -08:00
Hamish Friedlander
4b54383d68 API change request handling to be more orthogonal
RequestHandler#handleAction now exists. It takes the request, and
the action to call on itself. All calls from handleRequest to call an action
will go through this method

Controller#handleAction has had it's signature changed to
match new RequestHandler#handleAction

RequestHandler#findAction has been added, which extracts the
"match URL to rules to find action" portion of RequestHandler#handleRequest
into a separate, overrideable function

GridField#handleAction has beeen renamed to handleAlterAction and
CMSBatchActionHandler#handleAction has been renamed to handleBatchAction to
avoid name clash with new RequestHandler#handleAction

Reason for change: The exact behaviour of request handling depended heavily
on whether you inherited from RequestHandler or Controller, and whether the
rule extracted it's action directly (like "foo/$ID" => 'foo') or dynamically
(like "$Action/$ID" => "handleAction"). This cleans up behaviour so
all calls follow the same path through handleRequest and handleAction, and
the additional behaviour that Controller adds is clear.
2013-02-18 14:56:04 +13:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Ingo Schommer
eafafb31e3 Fixed screen.css (wrong compilation) 2013-02-18 01:28:17 +01:00
Ingo Schommer
604ede30a4 BUGFIX Escape HTML in CMS status messages 2013-02-17 23:27:15 +01:00
Ingo Schommer
e21bd49462 BUG TimeField respects user choice (fixes #8260)
Regression from c969e04731.
Also fixes width to accommodate for widest common format:
"11:11:11 AM"
2013-02-17 21:00:02 +01:00
Ingo Schommer
923ad8861f Layout regression in "add pages"
Unrelated fields affected by changes to CMS tooltips. See 1ca3883a76.
2013-02-13 10:15:06 +01:00
Robert Curry
7ff8d35be0 Force preview window to refresh on every save 2013-02-08 12:04:18 +13:00
Ingo Schommer
14a56c18e9 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/Director.php
2013-02-07 21:45:16 +01:00
Jeremy Bridson
2e77e87ed3 BUGFIX: fix for broken layout in insert media dialog - Trac #8232 2013-02-07 21:43:34 +01:00
senglmann
bb223bb35f Update admin/javascript/lang/de_DE.js
fixed typo in translation
2013-02-06 10:13:49 +01:00
Ingo Schommer
b350ded87c Fixed DatetimeField formatting (single row, smaller field)
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Ingo Schommer
1acb416a7f NEW Don't load CMS preview iframe if not visible (fixes #8247) 2013-02-05 10:23:48 +01:00
Sean Harvey
ba825cec28 Remove whitespace from LeftAndMain_Menu 2013-02-05 12:30:14 +13:00
Ingo Schommer
0e6912c8cd Re-added 'auto' sizing for CMS preview
Regression from making sizes configurable via JS
2013-02-04 13:43:04 +01:00
Ingo Schommer
1c045b5509 Smaller styling for minor actions in CMS 2013-02-04 13:43:03 +01:00
Kirk Mayo
0cb6b4630f NEW Storing page preview states (fixes #8092) 2013-02-04 13:43:01 +01:00
Ingo Schommer
1bb109041f FIX Node updates in IE without non-object error
Bug was most prominent after page publication,
which triggers a node reload. It iterated through
all node attributes to assign them to the existing node,
which apparently includes some non-scalar attributes
that can't simply be copied in IE.
2013-01-31 18:59:20 +01:00
Ingo Schommer
013f4cfe88 Merge pull request #1052 from kinglozzer/leftandmain-preview-click-bug
BUG: Right click on LeftAndMain menu caused CMS preview pane to open
2013-01-30 05:50:39 -08:00
uniun
ebe41cdadf CSS fixes for Batchactions.
On some browsers Batchactions block looked OK, but on others (e.t. Opera on Linux) every element in Batchactions block had different height.
The height of these elements was related to font size which is a little bit different on every OS'es and browsers.

See https://github.com/silverstripe/sapphire/pull/1132
2013-01-30 14:46:25 +01:00
Ingo Schommer
eb7fed9ab5 FIX Prevent defocus on first change in CMS HTMLEditorField (fixes #8217)
Regression caused by https://github.com/silverstripe/silverstripe-cms/commit/26cc14a9
2013-01-30 12:40:52 +01:00
Ingo Schommer
38e930dfe6 FIX Blocking of preview screen (regression)
Blocked when it should be editable, due to entwine's
onunmatch not firing when it was expected to.
2013-01-30 11:32:55 +01:00
Ingo Schommer
56336c3758 Merge pull request #1101 from chillu/pulls/preview-configuration
NEW Preview size and default mode configurability
2013-01-29 08:16:33 -08:00
Sander van Dragt
b645703eb9 Sort menu items according to priority descending, then title ascending 2013-01-29 15:30:35 +00:00
Ingo Schommer
3457f43839 BUG Respect CMS preview active state (related to #8089) 2013-01-25 11:33:48 +01:00
Ingo Schommer
072b485f66 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
2013-01-22 12:05:48 +01:00
Ingo Schommer
f7c8778466 Breadcrumb/back nav in ModelAdmin now retains search params 2013-01-21 12:04:20 +01:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
2013-01-21 11:14:57 +01:00
Ingo Schommer
89176e8f5d Unescaped breadcrumbs for inline groups display (fixes #7936) 2013-01-21 08:51:16 +01:00
Tony Air
e1517044cf Application Name fix 2013-01-21 08:09:47 +01:00
Nicolaas
7523fe4ef7 Update admin/code/ModelAdmin.php
Changed "Clear Database before import" - which is incorrect (not the whole database gets wiped, only the data in the model at hand) with the simpler: "replace data".
2013-01-19 22:38:55 +13:00
Ingo Schommer
432ff753c2 Wider side panel to fit "add" and "edit" button
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.

Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
2013-01-16 00:38:24 +01:00
Ingo Schommer
dc43a6b0f6 Wider sidebar to accommodate "add" and "edit" buttons
Conflicts:
	admin/css/screen.css
2013-01-16 00:38:24 +01:00
Ingo Schommer
ca84ddca16 NEW Preview size and default mode configurability 2013-01-15 16:50:57 +01:00
Ingo Schommer
64d3a3dafc BUG Don't double unescape URLs in history.js (fixes #8170)
Merged in pull request https://github.com/balupton/history.js/pull/108.
This has been a serious problem with the library for more than a year,
see https://github.com/balupton/history.js/issues/228.
2013-01-15 13:27:11 +01:00
jean
420c639e7b FIX Properly show link for showing and hiding class spec in model admin 2013-01-15 18:52:05 +13:00
Jeremy Bridson
a93f8841d7 BUGFIX:fixed broken styling of iframe in IE for member and group import 2013-01-15 00:57:47 +01:00
Ingo Schommer
703c10aa0e Restored inlined styling of .fieldgroup (same UI as in 2.x) 2013-01-14 17:01:08 +01:00
Ingo Schommer
0a00fea334 Removed .fieldgroup styles specific to one UI use case 2013-01-14 16:59:22 +01:00
Ingo Schommer
b918487375 Fixed preview overlay showing by default
This was a regression made visible by the recent change to
enforce dimensions on this overlay, which in turn visualizes
the blocked/unblocked states of the preview (see fc6d6ffad)
2013-01-11 00:23:47 +01:00
Ingo Schommer
76e233de70 Only show preview switch if states are available
We've removed all states from RedirectorPage in order to disable the redirect.
2013-01-09 21:43:10 +01:00
Ingo Schommer
80ee913f26 Correct dimensions for preview overlay
During the side-by-side refactoring, those were removed,
rendering the overlay invisible, which lead to the "blocked"
state not being shown at all.
2013-01-09 21:42:20 +01:00