Commit Graph

1035 Commits

Author SHA1 Message Date
Shannon
5d49dfbe28 refactors showSearchResults to be part of appState 2013-11-13 14:25:07 +11:00
Shannon
5889140386 Created the new appState service - this will be used to control all of the tracked back office state and used used explicitly by getting/setting values by key - cannot be mutable without defining properties first, then other controllers/services can listen for changes to state and act accordingly. Theoretically the navigationService 'should' be the only thing setting any of the state. Have started refactoring out the easy wins to move away from the dreaded ui object. 2013-11-13 13:50:36 +11:00
perploug
9ad869d367 merge 2013-11-12 19:29:15 +01:00
perploug
acbde943b0 replaces the datepicker with a native angular picker 2013-11-12 19:01:48 +01:00
perploug
c4a0e1e923 changes options to actions 2013-11-12 19:01:24 +01:00
perploug
8465b3465b ensures history is reset on login 2013-11-12 19:00:51 +01:00
perploug
8666ae0540 sections css tweak 2013-11-12 19:00:37 +01:00
perploug
9c8e156768 fixes dublicate help and user dialogs 2013-11-12 19:00:25 +01:00
perploug
9efe68724d Fixes dublicate key bindings for hotkeys 2013-11-12 19:00:08 +01:00
Shannon
bb4a7ef21f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-11-12 20:53:06 +11:00
Shannon
abb6b6519f Fixes gravatar JS issue if user times out 2013-11-12 20:52:55 +11:00
perploug
ad9fa736f4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-12 10:05:46 +01:00
perploug
cad0f8bb2a WIP on photo folderresiizng on IE 2013-11-12 10:05:26 +01:00
perploug
289caa791a moves touch device prop to rootscope 2013-11-12 10:04:40 +01:00
perploug
bfa325163d adds fall-back icon to content types 2013-11-12 10:03:59 +01:00
perploug
f03e9ecebe adds check to dialog swiping 2013-11-12 10:03:34 +01:00
perploug
0ab2b74004 fixes missing legacy icons in IE 2013-11-12 10:03:19 +01:00
perploug
fe40288514 fixes dublicate hotkey in legacy editors 2013-11-12 10:02:59 +01:00
Shannon
df867af900 Fixes: U4-3329 Link to "Edit Profile" errors if you don't have access to Users 2013-11-12 18:13:00 +11:00
Shannon
5f5f535f05 Changes UserController to be CurrentUserController - and removes the other methods in there since that was an overlooked security issue. This controller is responsible solely for dealing with the currently logged in user. Changes over to be currentuser.resource as well. 2013-11-12 18:07:10 +11:00
Shannon
a532b49485 Fixes: U4-3482 keepUserLoggedIn setting ignored? and streamlines some of the auth methods. 2013-11-12 17:38:32 +11:00
Shannon
a9ffa3f1b7 his reverts commit c2fca795e6 to use the normal tree cache 2013-11-12 15:06:47 +11:00
Shannon
c2fca795e6 This is an attempt to put the tree cache into sessionStorage - I'm creating this revision in case we want to re-visit this but unfortunately it is much more difficult because the cache is serialized/deserialized which means only the first level will be cached automatically since the loadNodeChildren would have to update the cache too but it doesn't know what a cache key is.
I've then done it the other way which is that we cache the tree sections when changing sections, this works great but poses other issues due to the serialized nature of the tree nodes. Spending too much time here, will revisit some other day. will revert after this is committed.
2013-11-12 15:02:02 +11:00
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