tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,692 Commits 31 Branches 527 Tags 162 MiB
7c24703804
Commit Graph

169 Commits

Author SHA1 Message Date
Mateusz Uzdowski
8f5acd70b3 API Move state to enwtine properties, provide API for preview. 
Also the preview state is now kept between panel loads. We also use a
redraw function to update appearance based on the state.
 2012-12-10 17:52:01 +01:00
Naomi Guyer
9312c70696 Side-by-side preview options fixes. 
Add extra preview-mode selector to the CMS actions so we can show
something when the preview is closed (and with it all options are not
visible).

Thanks @mateusz, @clarkepaul and @robert-h-curry for contributing.
 2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
d4f13fe532 API Refactor the CMS layouting to provide access to options. 
It is now possible to change the threeColumnLayout width options for the
columns via entwine property LayoutOptions and accessor methods.

Thanks @robert-h-curry, @clarkepaul for contributing!
 2012-12-10 17:52:01 +01:00
Paul Clarke
544d2eb6e1 Side-by-side preview options styling. 
Thanks @adrexia for contributing.
 2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
f4b080ee06 NEW Side by side editing functionality - first cut (os#7412) 
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
 2012-12-10 17:51:35 +01:00
Ingo Schommer
33039958c2 Merge pull request #965 from silverstripe-droptables/incorrect-bc-nesting 
BUG Incorrect html nesting of breadcrumbs
 2012-11-22 15:28:54 -08:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0' 
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
 2012-11-22 23:51:28 +01:00
Naomi Guyer
a933847217 BUG Incorrect html nesting of breadcrumbs 
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Goes alon the cms commit 4fab9b8248819dc9008d5b94b5437cd833de31ac
 2012-11-22 12:20:02 +13:00
Loz Calver
ea2dc9da0e ENHANCEMENT: Add ability to change URL for SS logo in CMS Menu 2012-11-09 11:06:04 +01:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	admin/css/screen.css
 2012-11-06 19:56:34 +01:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9 
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
 2012-11-06 19:45:56 +01:00
Naomi Guyer
84851c96a7 Remove sub navigation for "Files" (fixes 7956) 2012-10-23 09:55:08 +13:00
Saophalkun Ponlu
e3a27ea7da CMS member profile now is no longer in a popup (#7880) 2012-10-08 12:57:55 +02:00
Jeremy Bridson
ad7383a58d ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:30:47 +13:00
Ingo Schommer
cac540d252 Merge branch '3.0' 2012-08-10 00:19:00 +02:00
Ingo Schommer
c7fd9a6605 CMS Localization 2012-08-10 00:17:34 +02:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
Ingo Schommer
d0a9811087 BUG Fully qualified namespace for _t() in templates 
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
 2012-08-06 13:44:21 +02:00
Andrew Short
2a9a4bede7 Fixed nested tab styling in other CMS interfaces. 2012-07-06 12:48:36 +10:00
Ingo Schommer
415a680802 BUGFIX CMS Breadcrumbs and tabs as inline blocks which can span multiple lines, rather than being cropped off (fixes #6882) 2012-06-06 21:05:33 +02:00
Ingo Schommer
5178954311 UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts 2012-05-30 15:07:13 +02:00
Ingo Schommer
e185a9b8f8 MINOR Adding title to menu items so they can be more easily identified in collapsed mode 2012-05-18 20:07:06 +02:00
Sean Harvey
6f672e5f36 MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary. 2012-05-11 13:49:20 +12:00
Ingo Schommer
2c878f5296 MINOR Template consistency between TabSet.ss and overloaded LeftAndMain tabsets 2012-05-08 11:25:47 +02:00
Ingo Schommer
23148b959a Merge pull request #402 from ohararyan/sapphire 
---

http://open.silverstripe.org/ticket/7214

Added watermark to show current state of preview.
Removed button styling from Draft and Preview and added styling to show current selected state.

Designs signed off by Paul

Conflicts:
	admin/css/screen.css
 2012-05-07 13:01:00 +02:00
Ryan O'Hara
abb5719d33 ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214) 2012-05-04 13:53:33 +12:00
Ryan O'Hara
92484581e3 ENHANCEMENT: Add disabled state to preview buttons and add watermark for the current state being viewed (TRAC:7214) 2012-05-04 13:53:33 +12:00
Ingo Schommer
4029f96728 ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:19 +02:00
Ingo Schommer
0d1e4cece5 Merge pull request #395 from silverstripe-big-o/sapphire 
---

...tAdmin + regenerated css files.
 2012-05-03 11:26:12 +02:00
Normann Lou
826878b45d ENHANCEMENT: add header icon to CMSFileAddController when uploading file and SecurityAdmin when editing a member record 2012-05-03 18:16:35 +12:00
Ingo Schommer
feab46e075 MINOR Marking ModelAdmin tools filters panel as expanded by default (related to #7210) 2012-05-01 14:08:55 +02:00
Ingo Schommer
d8bb1b2375 MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:18 +02:00
Ingo Schommer
6bee103d14 MINOR Removed hardcoded children entries from CMS Menu (and record setting logic), as the related controllers have been merged to be accessible under the same top-level menu 2012-04-17 11:03:09 +02:00
Ingo Schommer
d44f6b3e1f MINOR Removed deprecated usage of $priority argument in _t() calls 2012-04-15 17:17:17 +02:00
Sean Harvey
8949dfa691 ENHANCEMENT Replaced locations of sapphire with $ModulePath(framework) in templates, based off Controller which implements TemplateGlobalProvider 2012-04-15 10:50:20 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Ingo Schommer
3572b31a94 MINOR Default app title when SiteConfig object is not present (fixes #7114) 2012-04-13 16:21:30 +02:00
Jeremy Bridson
6a7668fefb ENHANCEMENT:Trac 6882 - created include template for back button and altered the templates accordingly 2012-04-13 16:06:15 +12:00
Normann Lou
fac2664e01 MINOR: add 'edit-profile-popup' as extra popup class 2012-04-03 12:50:13 +12:00
jbridson
236f2673e1 MINOR:changed the heading 'add pages' to add page trac #7026 2012-03-27 17:02:19 +02:00
Will Rossiter
71f37b993c BUGFIX: #6840 Fix navigation highlights on LeftAndMain 2012-03-24 11:57:29 +13:00
Sean Harvey
fc9e065e44 BUGFIX Don't show "Import" header if ImportForm isn't available in 
ModelAdmin_Tools template
 2012-03-15 14:18:56 +13:00
Ingo Schommer
bac23bcdb7 BUGFIX Correctly set $BaseCSSClasses on LeftAndMain content container templates, not only on forms. Fixes $('.cms-menu') handling of "current id" updates (fixes #6997) 2012-03-12 14:05:54 +01:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25 
SSF-25: ModelAdmin
 2012-03-09 15:23:20 -08:00
Ingo Schommer
549ebec53b MINOR Fixed preview link ($CurrentPage stopped working at some point..) (fixes #6940) 2012-03-09 21:48:28 +01:00
Ingo Schommer
e12a3a4ab7 API CHANGE ModelAdmin uses GridField, DataList and new layout. Removed ModelAdmin_CollectionController, ModelAdmin_RecordController and related functionality. 
API CHANGE Removed ModelAdmin->ResultColumns()/ColumnSelectionField, selection of own fields no longer possible through the UI, to be replaced by a more generic GridField component
 2012-03-09 15:15:58 +01:00
Naomi Guyer
b7f5f91759 BUG FIX: Open new window for "Help" in CMS nav 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 14:07:12 +13:00
Normann Lou
de69d0944b BUGFIX SSF-25 : $Form is not defined in the context, sine {$Form.Name} always give 'Form' string, we need just have 'Form' string there instead to use {$Form.Name} 2012-03-08 15:38:02 +13:00
Normann Lou
767336916b ENHANCEMENT SSF-25 : use a title if users/devs has set one instead using a hard-coded one 2012-03-08 15:17:52 +13:00
Normann Lou
88a61f9ebe MINOR SSF-30 : add extra field to Tabs (listView and TreeView) to LeftAndMain EditForm 2012-03-07 14:30:24 +13:00
Ingo Schommer
6f71186e2c ENHANCEMENT Replaced SecurityAdmin tree view for groups with three top-level tabs: "Users", "Groups" and "Roles" 2012-03-05 18:31:52 +01:00
Ingo Schommer
0117b32fee API CHANGE Removed MemberTableField, use GridField with GridFieldConfig_RelationEditor instead 2012-03-05 17:41:51 +01:00
Ingo Schommer
02e728fa08 BUGFIX Fixed visibility of admin/myprofile for non-admins by moving it to a new CMSProfileController class and overloaded canView() 2012-03-02 20:46:22 +01:00
jbridson
59df00d302 BUGFIX:fixed position of back button in the cms-content-header - adapted design to work around the inclusion of tabs. 2012-02-29 11:06:42 +13:00
Ingo Schommer
a62881a137 MINOR Always padding panels 2012-02-28 18:09:32 +01:00
Ingo Schommer
832d410303 MINOR Merge errors 2012-02-28 00:34:15 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc' 
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
 2012-02-27 23:58:10 +01:00
Ingo Schommer
f1775b5f84 MINOR Backlinks in CMS edit form template, first defined in GridFieldPopupForms 2012-02-27 23:52:49 +01:00
Ingo Schommer
e95a2cf40c MINOR Pad fields in base CMS template when no tabs exist, to avoid requiring a template overload for this simple view setting 2012-02-27 23:52:48 +01:00
Ingo Schommer
bb42afe32f MINOR Removed inline CSS styles 2012-02-23 23:29:58 +01:00
Ingo Schommer
6e6fdaf79e MINOR Applying default padding to edit form template rather than the tabs it contains, which allows a more standardised UI even when no tabs are present in the CMS content area (e.g. in "add files") 2012-02-23 18:39:42 +01:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
4e99af7047 MINOR Using HTML5 data attributes for denoting layout in templates 2012-02-17 13:35:54 +01:00
Ingo Schommer
44d82209a9 MINOR Improved collapsed panel view by auto-hiding panel headers and avoid ugly cropped overflow effect 2012-02-15 14:26:46 +01:00
Ingo Schommer
a1e9c0f41e ENHANCEMENT CMS panels restructured to use two new types of "tools" templates, fetched through LeftAndMain->Tools() and LeftAndMain->EditFormTools(). Requires less overloading of template markup. 2012-02-15 14:26:45 +01:00
Ingo Schommer
92d513857c MINOR Changed $Left placeholder in CMS templates to $Tools, documented it 2012-02-15 14:26:45 +01:00
Ingo Schommer
37dfbb6b7e ENHANCEMENT LeftAndMain->Breadcrumbs() 2012-02-14 17:31:32 +01:00
Will Rossiter
649f4cef9c ENHANCEMENT: allow left column on LeftAndMain::getEditForm 2012-02-11 14:01:43 +13:00
Ingo Schommer
c2f201f6ca MINOR Fixed profile link (was broken due to admin/ => admin/pages redirect) 2012-02-08 15:34:41 +01:00
Ingo Schommer
d261f4406a API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:21 +01:00
Ingo Schommer
f50e11bbfb MINOR Separating menu entries for "add file" and "edit file" 2012-01-09 21:17:56 +01:00
Ingo Schommer
ef514b924e MINOR Fixed SecurityAdmin styling 2012-01-09 10:09:40 +01:00
Ingo Schommer
e7747b0240 ENHANCEMENT Saving panel collapse UI state in cookie 2012-01-06 16:58:00 +01:00
Ingo Schommer
6edf055dff ENHANCEMENT Added children toggle actions to CMS menu, fixed menu link update behaviour when records change 2012-01-05 23:17:55 +01:00
Ingo Schommer
47f53dfa39 MINOR Reverted special styling of preview button in CMS, too hard to keep consistent alignment 2011-12-20 17:46:43 +01:00
Ingo Schommer
068fcb209f MINOR Added temporary, hardcoded "add page" menu links 2011-12-20 14:10:08 +01:00
Ingo Schommer
f1f8dcd24d MINOR Improved CMS UI context by showing breadcrumbs in form record title, using current record instead of form field to determine values 2011-12-19 14:57:11 +01:00
Ingo Schommer
bc2bb53274 MINOR Fixed drag'n'drop in SecurityAdmin (thanks frankmullenger) 2011-12-18 16:01:36 +01:00
Frank Mullenger
160f712f68 BUGFIX: Update the page title heading on edit page in CMS (fixes #6809) 2011-12-18 15:34:00 +01:00
Will Rossiter
4d0d5799bb MINOR: merged edlinklater/master into master. Fixes #134 2011-12-17 16:12:21 +13:00
=
d407f4c613 MINOR: Revert special formatting of preview button, fix Action button icons in IE8 2011-12-17 15:56:34 +13:00
Will Rossiter
a04c1410e1 BUGFIX: update admin menu links when current page ID updates. Fixes #6768. 2011-12-17 15:51:02 +13:00
Will Rossiter
01bfdbeb90 MINOR tweaks to SecurityAdmin layout 2011-10-29 15:47:08 +13:00
Will Rossiter
a08a08eaa0 MINOR move panel title into scrollable panel 2011-10-29 15:47:07 +13:00
Will Rossiter
aba6b44163 MINOR remove console.log. MINOR clean up for icon sprites in the cms and content toolbars 2011-10-29 15:47:07 +13:00
Will Rossiter
6b88006456 BUGFIX show scroll bar on menu and side panels in adminstration section rather than hiding 2011-10-29 15:47:07 +13:00
Ingo Schommer
7408ba4a54 ENHANCEMENT Removed unnecessary "Edit Page > Reports" menu entry, feature will only be available through a dedicated "Reports" interface 2011-10-04 13:16:55 +02:00
Will Rossiter
2036354d8d ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain interface 2011-09-19 17:26:01 +02:00
Will Rossiter
60cba7dd76 BUGFIX: fixed submenu not opening in cms-menu when cms loads on page other than edit page section 2011-09-19 17:22:36 +02:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
4461cae31b ENHANCEMENT New CMSPreviewable interface class to standardize metadata making a record previewable by the CMS. 
ENHANCEMENT New "preview" and "edit" buttons to toggle between preview and cms views. Reinstated utility links to switch between draft and live preview (based on SilverStripeNavigator) (formerly called "AjaxSwitchView")
 2011-08-12 17:05:50 +02:00
Will Rossiter
dc222d54f8 MINOR: changed icon size for lefthand menu down to 16x16 rather than 24x24 2011-08-09 11:39:12 +12:00
Will Rossiter
1827c18fe1 BUGFIX: fixed CMSMain menu being displayed on CMSPageController pages. MINOR: added icons for main left hand side. 2011-07-28 16:57:41 +12:00
Ingo Schommer
19b9edb170 MINOR Clearer CSS classes in CMS controller templates. Fixed JS loading of ModelAdmin panels. Added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag). Leaving $BaseCSSClasses in LeftAndMain.ss base template for legacy reasons. 2011-07-08 15:36:46 +02:00
Ingo Schommer
ff54044206 API CHANGE Forms in ajax responses from LeftAndMain and subclasses include <form> tags, and replace the form itself on the client (rather than just everything inside the form). Form submissions and loading is handled by its container ('.cms-content') to avoid problems with a DOM element replacing itself upon form submission. 2011-07-08 15:36:46 +02:00
Ingo Schommer
0e0a59df99 ENHANCEMENT Collapsible menu, disable menu actions on external links 2011-07-08 15:36:45 +02:00
Ingo Schommer
4e0949f565 ENHANCEMENT Consistently wrapping CMS forms in <div class="cms-content">, added LeftAndMain.Content.js to reload panels via ajax, hooking into preview logic 2011-07-08 15:36:44 +02:00
Ingo Schommer
686f101925 ENHANCEMENT Toggleable panels in CMS 2011-07-08 15:36:43 +02:00
Will Rossiter
6956275d2e MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier 2011-05-20 11:29:40 +12:00