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
17,152 Commits 31 Branches 527 Tags 162 MiB
ed4270155b
Commit Graph

219 Commits

Author SHA1 Message Date
Ingo Schommer
6ee0d53f40 Fixed merge error (mainly new translation entity format in templates) 
Merge error from 2a35f2f928,
which was then further regressed by Sam running the text collector
on those faulty templates: 750b5b4079
 2013-08-09 15:27:28 +02:00
Ingo Schommer
afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
 2013-08-07 17:14:47 +02:00
Ingo Schommer
00ffe72944 Translations: Switch to Transifex format 
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
  issues with unknown locales in Zend's CLDR database
 2013-08-07 00:25:16 +02:00
ARNHOE
2427d57fa5 Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
Andrew Short
f2b4b95350 FIX: Set ModelAdmin tab targets to avoid creating new panels 2013-03-29 01:41:31 +11:00
Sean Harvey
ba825cec28 Remove whitespace from LeftAndMain_Menu 2013-02-05 12:30:14 +13:00
Ingo Schommer
3457f43839 BUG Respect CMS preview active state (related to #8089) 2013-01-25 11:33:48 +01:00
Tony Air
e1517044cf Application Name fix 2013-01-21 08:09: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
Naomi Guyer
92e4b4fc5b Remove sub navigation for "Files" (fixes 7956) 
Backport from master. Fixes display issues with expanded,
unselected submenus ... by removing them.
They're strictly not necessary since both "list" and "add"
modes can be reached through the default AssetAdmin UI.
 2012-12-12 23:16:03 +01:00
Naomi Guyer
dbee4a1bf9 Clean up the side-by-side code. 2012-12-10 17:52:02 +01:00
Paul Clarke
747346bb16 Ability to rotate the mobile preview in side-by-side preview. 2012-12-10 17:52:02 +01:00
Naomi Guyer
00f1ba4ab0 Side-by-side preview browser compatibility fixes. 2012-12-10 17:52:02 +01:00
Naomi Guyer
8ce272861c Replace the state selector switch to support more than 2 states. 2012-12-10 17:52:01 +01:00
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
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Ingo Schommer
bcbf4636fc BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7980) 
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
 2012-11-01 00:25:13 +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
56f7ce1dcf 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
 2012-10-03 16:16:19 +02:00
Ingo Schommer
d50341d8cd Rendering attributes for CMSTabSet.ss 
Make behaviour consistent with parent template, Tabet.ss
 2012-09-28 16:37:34 +02: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
martimiz
b1ee36e3aa Fix: display the correct (menu) icon in the GridFieldDetailForm's breadcrumbs. 
In CMSBreadcrumbs.ss the (TopLevel)Controller is not recognized within
the Breadcrumbs loop, so the class that is used in css to style the
icon cannot be created. Moving the construction outside the loop will
remedy this. As far as I can see this works within the CMS.
 2012-08-08 17:30:20 +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
2212363a0f MINOR Using new extraClass support in tabs for CMSTabSet 2012-05-08 11:25:46 +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
Jeremy Bridson
64300caae3 ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs in cms-content-header 2012-04-16 16:31:24 +12: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
Ingo Schommer
b025b95ede ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin) 2012-04-12 23:53:12 +02:00
Julian Seidenberg
1e0b843353 ENHANCEMENT: refactoring code for making a link an ajax/history link. Removing the selector that targets .crumb and only applying the selector that turns links with cms-panel-link into ajax enabled links. Adding the cms-panel-link to those links that already have the crumb class. 2012-04-10 18:16:27 +12:00
Julian Seidenberg
9183890148 BUGFIX: SSF-168 fixing Webkit rendering issue that would display elements outside of an absolute positioned layout, breaking the layout in the reportadmin section. The fix is to hide to container that breaks the layout and use js to move the required elements out of the container when the CMS needs them. 2012-04-10 12:41:47 +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
Ingo Schommer
e443ec5c9c Merge pull request #244 from sminnee/ipad-fixes 
BUGFIX: Remove stray scrolling and zooming glitches on iPad.
 2012-03-15 03:03:45 -07: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
Sam Minnee
069d7117d7 BUGFIX: Remove stray scrolling and zooming glitches on iPad. 2012-03-15 14:13:30 +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
5e92c69c0a BUGFIX SSF-25 : remove CreateForm, using the GridField 'Add New" action, instead 2012-03-08 20:29:19 +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
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
3866f561f5 ENHANCEMENT Using GridField for file selection in "insert image" dialog 
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
 2012-02-14 13:30:52 +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