Commit Graph

1012 Commits

Author SHA1 Message Date
Shannon
c4bfeeb321 Changes the CreateTreeNode to ensure that a parentId is always passed in - now all tree node models have a parentId property based on the server side data. Changes the JS tree node model to not have a 'parent' property and instead changes this to a parent() method - this allows us to serialize the tree model because otherwise it has cyclical references. 2013-11-12 13:09:24 +11:00
Shannon
acd52d42f4 Refactoring TreeNode to inherit from EntityBasic = makes much more sense and makes our models more consistent. 2013-11-12 12:30:10 +11:00
Shannon
635ccc444d Adds another childrenOf option to clearing tree cache to clear a cached branch, this is used to fix U4-3465 Media tree not updating when creating folders and can be used elsewhere where modifying trees outside of it's context. 2013-11-12 12:01:16 +11:00
Shannon
6dcfbaee7f Adds a new filter arg to remove tree cache - we will use this in order to clear specific items from tree cache (like when we are creating folders for media in the media picker) 2013-11-12 11:09:30 +11:00
Anders Stentebjerg
6fb6aa397f Styling
- Logo size login screen
- H1 in panel
2013-11-11 15:34:49 +01:00
Shannon
57e98fda97 Fixes setting the 'section' on a tree node, fixes the editors syncTree call to not force reload when routing to the editor - this will still load in the data for the tree if it is missing, just won't force reload the individual tree node loading. 2013-11-11 17:54:42 +11:00
Shannon
3111a2d22f Missing file 2013-11-11 17:12:35 +11:00
Shannon
f123c58c79 Fixes up some more tree sync, streamlines naming conventions, adds more doc/comments to the code and specifies what is internal (only to be used by legacy code). syncTree method now takes an object to sync and both sets the active tree and the path at the same time and fixes setting the active tree to search the root node and children because content/media trees are single section trees. 2013-11-11 17:12:09 +11:00
Shannon
9f613c04f3 Fixes more tree syncing - setActiveTreeType should *not* perform any tree loading, it should just set the active root tree node. syncTree is always used in conjunction with that call in the legacy API which means we get 2 tree queries loading at once and syncing ends up not working. We'll create a nicer method for our angular views to use to sync the tree, setActiveTreeType will typically only be used by the legacy umbraco wrapper. 2013-11-11 16:15:09 +11:00
Shannon
8fc82476a6 Fixes some tree syncing with legacy trees - now need to cleanup the delete animation stuff. 2013-11-11 14:36:45 +11:00
Shannon
0d42f721db fixed more tree sync 2013-11-08 12:35:42 +11:00
Shannon
7664cec0d3 Fixes: U4-3442 tree sync doesn't work for nodes that are not loaded - tree sync is now working properly and loads in any nodes that are missing. Have removed the dependency on navigationService from umbTree directive since it should not have that dependency. navigationService now sets it's global current node after treeSync based on an event. Moved the treeSync logic to the treeService so it can be unit tested (now to write the unit tests). Added another method to treeService to reload a single node - this is now used by treeSync when the current node is being synced - much nicer than reloading all the children. Updates the treeService to always add the current section to each tree node, this will make it much easier to know the treenode section - and in theory should mean we might be able to remove the ui global currentSection var. 2013-11-08 11:48:04 +11:00
Shannon
ef40c76363 Re-formats the code structure of nav service and umbtree to be easier to read, adds better error checking to treeservice 2013-11-08 09:07:28 +11:00
Shannon
590b7f2289 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-08 08:49:07 +11:00
Anders Stentebjerg
2d09785753 Search form 1px up 2013-11-07 17:15:41 +00:00
perploug
7a31ba0de7 merge 2013-11-07 18:14:53 +01:00
Anders Stentebjerg
1cfb79788a Align header 2013-11-07 17:11:35 +00:00
Anders Stentebjerg
641d0c737f Styling
- Retina optimized gravatar
- White Umbraco logo
2013-11-07 16:51:25 +00:00
perploug
242b755b1a Tabs overflow 2013-11-07 17:48:54 +01:00
Anders Stentebjerg
fa0b3ddab9 Set focus on pageName 2013-11-07 16:30:14 +00:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
perploug
937bda9c16 select on focus directive 2013-11-07 17:11:32 +01:00
Anders Stentebjerg
2b3a9a0b8f U4-3449 Polish UX so it matches grid 2013-11-07 16:04:07 +00:00
perploug
8b879183ba Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-07 16:05:43 +01:00
perploug
0f424d314f Changes editor header editor to input:text 2013-11-07 16:05:22 +01:00
Shannon
30fe174601 working on U4-3442 tree sync doesn't work for nodes that are not loaded 2013-11-07 17:53:46 +11:00
Shannon
31448eb987 Fixes: U4-3427 Tree persistence not working 2013-11-07 17:41:44 +11:00
Shannon
29cf9ae46a Changes all references of navigationService.ui.currentTreeNode to be navigationService.ui.currentNode since that was what has existed previously, now suddenly we have 2 references to current tree node - I'm 99% sure that we only want one reference and currentTreeNode seems to have been added later and isn't declared properly on the nav service. 2013-11-07 17:32:06 +11:00
Shannon
01eb7157bd Adds missing moveNode from the legacy tree api 2013-11-07 17:20:01 +11:00
Shannon
3d6eea9470 Fixes: U4-3350 Content Validation: Can't get rid of DateTime error 2013-11-07 14:58:41 +11:00
Anders Stentebjerg
ceab957db5 Styling hover state on Page Name 2013-11-05 14:28:57 +01:00
perploug
fc6fb4030b re-adds deleted macro container files 2013-11-05 14:28:07 +01:00
perploug
f6b2888c26 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 13:56:45 +01:00
perploug
e41e017fa3 fixes dialog iframe auto-expanding 2013-11-05 13:56:20 +01:00
Anders Stentebjerg
63eccb4909 Styling: Error on tabs + hover state 2013-11-05 13:48:46 +01:00
Anders Stentebjerg
17529b90b6 Aling checkboxes and text 2013-11-05 13:16:43 +01:00
perploug
d2ae358a3d hide search list on selection 2013-11-05 12:38:45 +01:00
perploug
f30416d20f add border to bottom buttons 2013-11-05 12:38:32 +01:00
perploug
ef16e6c72f history service skip dublicate entries 2013-11-05 12:38:20 +01:00
perploug
51c459d654 Fixes placeholder label overriding name label 2013-11-05 12:38:01 +01:00
perploug
bcf20f9f3f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:00 +01:00
perploug
d9e18859e9 Media recyclebin 2013-11-05 12:00:53 +01:00
perploug
ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
Anders Stentebjerg
1c4129fd64 Disable input[submit] styling 2013-11-05 11:36:43 +01:00
perploug
4be6e21257 media editor tree sync 2013-11-05 11:18:23 +01:00
perploug
7e36a6b6e1 translation section icon 2013-11-05 11:18:06 +01:00
perploug
aa4bcdd040 color picker feedback 2013-11-05 11:17:58 +01:00
perploug
c9f29a443d member tree sync fixes 2013-11-05 11:17:43 +01:00
Shannon
cf342ece45 Fixes: U4-3322 MNTP doesn't work when choosing media or members 2013-11-05 18:17:16 +11:00
Shannon
fbeff81128 Fixes pickers to be backwards compatible - they by default in v6 stored as INT. Fixing MNTP with media/members. 2013-11-05 14:28:25 +11:00