From af6dfe364170e0f8e05ad4ddcf3cea90ac9a9a86 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 6 Dec 2014 14:53:53 +0100 Subject: [PATCH] Merge with master and upgrade to 7.2.0 --- .gitignore | 1 + Notification/Notification.csproj | 109 +- Notification/packages.config | 11 +- NotificationsWeb/NotificationsWeb.csproj | 109 +- NotificationsWeb/packages.config | 11 +- OurUmbraco.Site/OurUmbraco.Site.csproj | 88 +- .../Views/Partials/Grid/Bootstrap2.cshtml | 84 + .../Views/Partials/Grid/Bootstrap3.cshtml | 84 + .../Views/Partials/Grid/Editors/Base.cshtml | 24 + .../Views/Partials/Grid/Editors/Embed.cshtml | 3 + .../Views/Partials/Grid/Editors/Macro.cshtml | 17 + .../Views/Partials/Grid/Editors/Media.cshtml | 23 + .../Views/Partials/Grid/Editors/Rte.cshtml | 4 + .../Partials/Grid/Editors/Textstring.cshtml | 20 + .../config/ClientDependency.config | 2 +- OurUmbraco.Site/config/Dashboard.config | 4 +- OurUmbraco.Site/config/UrlRewriting.config | 2 +- OurUmbraco.Site/config/grid.editors.config.js | 46 + OurUmbraco.Site/config/log4net.config | 46 +- OurUmbraco.Site/config/splashes/noNodes.aspx | 177 +- OurUmbraco.Site/config/tinyMceConfig.config | 17 +- OurUmbraco.Site/config/trees.config | 1 - OurUmbraco.Site/config/uVersion.config | 1 + OurUmbraco.Site/config/umbracoSettings.config | 3 +- OurUmbraco.Site/images/our_logo.png | Bin 0 -> 2481 bytes .../repository-view-category.cshtml | 6 +- OurUmbraco.Site/packages.config | 11 +- .../umbraco/Views/AuthorizeUpgrade.cshtml | 2 +- OurUmbraco.Site/umbraco/Views/Default.cshtml | 2 +- .../common/dialogs/approvedcolorpicker.html | 7 + .../Views/common/dialogs/content/edit.html | 67 +- .../Views/common/dialogs/insertmacro.html | 6 +- .../Views/common/dialogs/linkpicker.html | 31 +- .../Views/common/dialogs/mediapicker.html | 25 +- .../common/dialogs/membergrouppicker.html | 38 +- .../Views/common/dialogs/rteembed.html | 3 +- .../common/dialogs/template/querybuilder.html | 158 + .../Views/common/dialogs/treepicker.html | 72 +- .../umbraco/Views/common/dialogs/ysod.html | 48 +- .../umbraco/Views/content/copy.html | 75 +- .../umbraco/Views/content/edit.html | 12 +- .../umbraco/Views/content/move.html | 87 +- .../umbraco/Views/content/recyclebin.html | 2 +- .../developer/examinemanagement.html | 231 + .../developer/xmldataintegrityreport.html | 31 + .../dashboard/forms/formsdashboardintro.html | 35 + .../settings/settingsdashboardintro.html | 6 +- .../umbraco/Views/datatype/edit.html | 3 +- .../directives/html/umb-control-group.html | 6 +- .../Views/directives/umb-content-name.html | 1 + .../Views/directives/umb-property.html | 2 +- .../Views/directives/umb-tree-search-box.html | 13 + .../directives/umb-tree-search-results.html | 17 + .../umbraco/Views/install/starterkit.html | 7 +- .../umbraco/Views/install/user.html | 1 + OurUmbraco.Site/umbraco/Views/media/edit.html | 7 + OurUmbraco.Site/umbraco/Views/media/move.html | 13 +- .../umbraco/Views/media/recyclebin.html | 2 +- .../umbraco/Views/member/edit.html | 10 + .../umbraco/Views/member/list.html | 27 + .../Views/prevalueeditors/imagepicker.html | 14 + .../prevalueeditors/radiobuttonlist.html | 7 + .../contentpicker/contentpicker.html | 7 +- .../datepicker/datepicker.html | 2 +- .../propertyeditors/dropdown/dropdown.html | 3 +- .../Views/propertyeditors/email/email.html | 10 +- .../grid/config/grid.default.config.js | 363 + .../grid/config/grid.default.rtestyles.css | 15 + .../propertyeditors/grid/dialogs/additem.html | 17 + .../propertyeditors/grid/dialogs/config.html | 44 + .../grid/dialogs/editconfig.html | 35 + .../grid/dialogs/layoutconfig.html | 116 + .../grid/dialogs/rowconfig.html | 92 + .../propertyeditors/grid/editors/embed.html | 10 + .../propertyeditors/grid/editors/macro.html | 17 + .../propertyeditors/grid/editors/media.html | 16 + .../propertyeditors/grid/editors/rte.html | 5 + .../grid/editors/textstring.html | 9 + .../Views/propertyeditors/grid/grid.html | 253 +- .../propertyeditors/grid/grid.prevalues.html | 163 + .../listview/includeproperties.prevalues.html | 55 + .../propertyeditors/listview/listview.html | 72 +- .../listview/orderDirection.prevalues.html | 12 + .../listview/sortby.prevalues.html | 5 + .../macrocontainer/macrocontainer.html | 14 +- .../macrocontainer/macrolist.prevalues.html | 7 + .../markdowneditor/markdowneditor.html | 6 +- .../memberpicker/memberpicker.html | 3 +- .../multipletextbox/multipletextbox.html | 2 +- .../Views/propertyeditors/rte/rte.html | 5 +- .../propertyeditors/rte/rte.prevalues.html | 2 +- .../Views/propertyeditors/tags/tags.html | 8 +- .../propertyeditors/textbox/textbox.html | 3 +- .../umbraco/assets/css/canvasdesigner.css | 3593 +++++++ .../umbraco/assets/css/installer.css | 54 +- .../umbraco/assets/css/nonodes.style.min.css | 1 + .../umbraco/assets/css/umbraco.css | 2 +- .../assets/img/forms/installer-background.png | Bin 0 -> 37864 bytes .../umbraco/assets/img/installer.jpg | Bin 781354 -> 701737 bytes OurUmbraco.Site/umbraco/assets/img/logo.png | Bin 0 -> 1746 bytes .../umbraco/assets/img/nonodesbg.jpg | Bin 0 -> 237538 bytes .../umbraco/assets/less/background.less | 25 + .../umbraco/assets/less/border.less | 70 + .../umbraco/assets/less/color.less | 14 + .../umbraco/assets/less/googlefontpicker.less | 34 + .../umbraco/assets/less/gridRow.less | 40 + .../umbraco/assets/less/layout.less | 96 + .../umbraco/assets/less/margin.less | 45 + .../umbraco/assets/less/padding.less | 45 + .../umbraco/assets/less/radius.less | 65 + .../umbraco/assets/less/shadow.less | 21 + .../umbraco/assets/less/slider.less | 19 + OurUmbraco.Site/umbraco/config/lang/cs.xml | 976 ++ OurUmbraco.Site/umbraco/config/lang/da.xml | 132 +- OurUmbraco.Site/umbraco/config/lang/de.xml | 36 +- OurUmbraco.Site/umbraco/config/lang/en.xml | 84 +- OurUmbraco.Site/umbraco/config/lang/en_us.xml | 164 +- OurUmbraco.Site/umbraco/config/lang/es.xml | 236 +- OurUmbraco.Site/umbraco/config/lang/fr.xml | 10 +- OurUmbraco.Site/umbraco/config/lang/he.xml | 46 +- OurUmbraco.Site/umbraco/config/lang/it.xml | 22 +- OurUmbraco.Site/umbraco/config/lang/ja.xml | 22 +- OurUmbraco.Site/umbraco/config/lang/ko.xml | 24 +- OurUmbraco.Site/umbraco/config/lang/nl.xml | 50 +- OurUmbraco.Site/umbraco/config/lang/no.xml | 58 +- OurUmbraco.Site/umbraco/config/lang/pl.xml | 58 +- OurUmbraco.Site/umbraco/config/lang/pt.xml | 68 +- OurUmbraco.Site/umbraco/config/lang/ru.xml | 147 +- OurUmbraco.Site/umbraco/config/lang/sv.xml | 82 +- OurUmbraco.Site/umbraco/config/lang/zh.xml | 18 +- .../controls/ContentTypeControlNew.ascx | 98 +- .../GenericProperties/GenericProperty.ascx | 3 +- .../umbraco/controls/ProgressBar.ascx | 2 +- .../umbraco/create/PartialView.ascx | 15 +- .../umbraco/create/PartialViewMacro.ascx | 11 +- OurUmbraco.Site/umbraco/create/nodeType.ascx | 10 +- OurUmbraco.Site/umbraco/create/script.ascx | 25 +- .../umbraco/developer/Macros/editMacro.aspx | 4 +- .../developer/Packages/installedPackage.aspx | 9 +- .../umbraco/developer/Packages/installer.aspx | 14 +- .../umbraco/developer/Packages/proxy.htm | 9 +- .../umbraco/developer/Python/editPython.aspx | 5 +- .../umbraco/developer/Xslt/editXslt.aspx | 4 +- .../umbraco/dialogs/republish.aspx | 4 +- OurUmbraco.Site/umbraco/dialogs/rollBack.aspx | 4 +- OurUmbraco.Site/umbraco/dialogs/sort.aspx | 6 +- OurUmbraco.Site/umbraco/js/app.dev.js | 3 +- OurUmbraco.Site/umbraco/js/app.js | 3 +- .../umbraco/js/canvasdesigner.config.js | 318 + .../umbraco/js/canvasdesigner.front.js | 297 + .../umbraco/js/canvasdesigner.loader.js | 19 + .../umbraco/js/canvasdesigner.palettes.js | 58 + .../umbraco/js/canvasdesigner.panel.js | 1828 ++++ OurUmbraco.Site/umbraco/js/loader.js | 2 + OurUmbraco.Site/umbraco/js/routes.js | 29 +- .../umbraco/js/umbraco.controllers.js | 5274 +++++++--- .../umbraco/js/umbraco.directives.js | 1238 ++- OurUmbraco.Site/umbraco/js/umbraco.filters.js | 2 +- .../umbraco/js/umbraco.httpbackend.js | 1 + .../umbraco/js/umbraco.installer.js | 3 +- .../umbraco/js/umbraco.resources.js | 392 +- .../umbraco/js/umbraco.security.js | 2 +- .../umbraco/js/umbraco.servervariables.js | 4 - .../umbraco/js/umbraco.services.js | 357 +- OurUmbraco.Site/umbraco/js/umbraco.testing.js | 231 +- .../ui-bootstrap-tpls-0.10.0.min.js | 9 + .../lib/angular/angular-ui-sortable.js | 263 +- .../umbraco/lib/angular/tmhDynamicLocale.js | 186 + .../lib/bootstrap/css/bootstrap.min.3.0.1.css | 9 + .../umbraco/lib/bootstrap/less/code.less | 4 +- .../umbraco/lib/cssparser/cssparser.js | 5495 ++++++++++ .../bootstrap-datetimepicker.js | 2678 ++--- .../bootstrap-datetimepicker.min.css | 11 +- .../jquery/jquery-ui-1.10.4.custom.min.css | 7 + .../lib/jquery/jquery-ui-1.10.4.custom.min.js | 7 + .../umbraco/lib/lazyload/lazyload.min.js | 664 +- .../umbraco/lib/less/less-1.7.0.min.js | 16 + .../umbraco/lib/moment/moment-with-locales.js | 9156 +++++++++++++++++ .../lib/tinymce/plugins/code/plugin.min.js | 8 +- .../tinymce/plugins/codemirror/langs/en.js | 8 + .../tinymce/plugins/codemirror/plugin.min.js | 24 + .../tinymce/plugins/codemirror/source.html | 254 + .../lib/typeahead/typeahead.bundle.min.js | 4 +- .../umbraco/lib/umbraco/LegacyUmbClientMgr.js | 79 +- .../umbraco/members/EditMemberType.aspx | 2 +- .../umbraco/preview/editors/background.html | 57 + .../umbraco/preview/editors/border.html | 20 + .../umbraco/preview/editors/color.html | 3 + .../preview/editors/googlefontpicker.html | 34 + .../umbraco/preview/editors/gridRow.html | 8 + .../umbraco/preview/editors/layout.html | 10 + .../umbraco/preview/editors/margin.html | 14 + .../umbraco/preview/editors/padding.html | 14 + .../umbraco/preview/editors/radius.html | 21 + .../umbraco/preview/editors/shadow.html | 8 + .../umbraco/preview/editors/slider.html | 8 + OurUmbraco.Site/umbraco/preview/index.html | 159 + .../umbraco/settings/EditNodeTypeNew.aspx | 22 +- .../umbraco/settings/editTemplate.aspx | 8 +- .../umbraco/settings/scripts/editScript.aspx | 10 +- .../settings/stylesheet/editstylesheet.aspx | 2 +- .../umbraco/settings/views/EditView.aspx | 14 +- .../Application/UmbracoApplicationActions.js | 2 +- .../Application/UmbracoClientManager.js | 34 +- .../CodeMirror/js/lib/codemirror.js | 4 + .../umbraco_client/Dialogs/SortDialog.css | 1 - .../umbraco_client/Editors/EditContentType.js | 108 + .../umbraco_client/Editors/EditScript.js | 15 +- .../umbraco_client/Editors/EditView.js | 35 +- OurUmbraco.Site/web.config | 61 +- OurUmbraco.Site/xslt/Web.config | 18 + .../Umb.OurUmb.MemberLocator.csproj | 106 +- Umb.OurUmb.MemberLocator/packages.config | 11 +- our.umbraco.org/our.umbraco.org.csproj | 104 +- our.umbraco.org/packages.config | 11 +- uDocumentation/packages.config | 11 +- uDocumentation/uDocumentation.csproj | 107 +- uEvents/packages.config | 11 +- uEvents/uEvents.csproj | 107 +- uForum/Businesslogic/Forum.cs | 68 +- uForum/packages.config | 11 +- uForum/uForum.csproj | 107 +- uPowers/packages.config | 11 +- uPowers/uPowers.csproj | 104 +- uRelease/Controllers/ApiController.cs | 22 +- uRelease/EventHandlers/FinalReleaseHandler.cs | 82 + uRelease/packages.config | 11 +- uRelease/uRelease.csproj | 108 +- uRepo/Projects.cs | 6 +- uRepo/RepoStartupHandler.cs | 20 + uRepo/StarterKit.cs | 11 + uRepo/StarterKitController.cs | 142 + uRepo/app.config | 14 +- uRepo/packages.config | 25 +- uRepo/uRepo.csproj | 194 +- uSearch/packages.config | 11 +- uSearch/uSearch.csproj | 106 +- uVersion/packages.config | 11 +- uVersion/uVersion.csproj | 111 +- uVersion/uWikiFileVerison.cs | 4 + uWiki/packages.config | 11 +- uWiki/uWiki.csproj | 103 +- 242 files changed, 36026 insertions(+), 5293 deletions(-) create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml create mode 100644 OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml create mode 100644 OurUmbraco.Site/config/grid.editors.config.js create mode 100644 OurUmbraco.Site/images/our_logo.png create mode 100644 OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html create mode 100644 OurUmbraco.Site/umbraco/Views/common/dialogs/template/querybuilder.html create mode 100644 OurUmbraco.Site/umbraco/Views/dashboard/developer/examinemanagement.html create mode 100644 OurUmbraco.Site/umbraco/Views/dashboard/developer/xmldataintegrityreport.html create mode 100644 OurUmbraco.Site/umbraco/Views/dashboard/forms/formsdashboardintro.html create mode 100644 OurUmbraco.Site/umbraco/Views/directives/umb-tree-search-box.html create mode 100644 OurUmbraco.Site/umbraco/Views/directives/umb-tree-search-results.html create mode 100644 OurUmbraco.Site/umbraco/Views/member/list.html create mode 100644 OurUmbraco.Site/umbraco/Views/prevalueeditors/imagepicker.html create mode 100644 OurUmbraco.Site/umbraco/Views/prevalueeditors/radiobuttonlist.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/config/grid.default.config.js create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/config/grid.default.rtestyles.css create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/additem.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/config.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/editconfig.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/layoutconfig.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowconfig.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/embed.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/macro.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/media.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/rte.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/textstring.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/grid.prevalues.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/listview/includeproperties.prevalues.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/listview/orderDirection.prevalues.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/listview/sortby.prevalues.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/macrocontainer/macrolist.prevalues.html create mode 100644 OurUmbraco.Site/umbraco/assets/css/canvasdesigner.css create mode 100644 OurUmbraco.Site/umbraco/assets/css/nonodes.style.min.css create mode 100644 OurUmbraco.Site/umbraco/assets/img/forms/installer-background.png create mode 100644 OurUmbraco.Site/umbraco/assets/img/logo.png create mode 100644 OurUmbraco.Site/umbraco/assets/img/nonodesbg.jpg create mode 100644 OurUmbraco.Site/umbraco/assets/less/background.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/border.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/color.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/googlefontpicker.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/gridRow.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/layout.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/margin.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/padding.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/radius.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/shadow.less create mode 100644 OurUmbraco.Site/umbraco/assets/less/slider.less create mode 100644 OurUmbraco.Site/umbraco/config/lang/cs.xml create mode 100644 OurUmbraco.Site/umbraco/js/canvasdesigner.config.js create mode 100644 OurUmbraco.Site/umbraco/js/canvasdesigner.front.js create mode 100644 OurUmbraco.Site/umbraco/js/canvasdesigner.loader.js create mode 100644 OurUmbraco.Site/umbraco/js/canvasdesigner.palettes.js create mode 100644 OurUmbraco.Site/umbraco/js/canvasdesigner.panel.js create mode 100644 OurUmbraco.Site/umbraco/lib/angular-bootstrap/ui-bootstrap-tpls-0.10.0.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/angular/tmhDynamicLocale.js create mode 100644 OurUmbraco.Site/umbraco/lib/bootstrap/css/bootstrap.min.3.0.1.css create mode 100644 OurUmbraco.Site/umbraco/lib/cssparser/cssparser.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery/jquery-ui-1.10.4.custom.min.css create mode 100644 OurUmbraco.Site/umbraco/lib/jquery/jquery-ui-1.10.4.custom.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/less/less-1.7.0.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/moment/moment-with-locales.js create mode 100644 OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/langs/en.js create mode 100644 OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/plugin.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/tinymce/plugins/codemirror/source.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/background.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/border.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/color.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/googlefontpicker.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/gridRow.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/layout.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/margin.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/padding.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/radius.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/shadow.html create mode 100644 OurUmbraco.Site/umbraco/preview/editors/slider.html create mode 100644 OurUmbraco.Site/umbraco/preview/index.html create mode 100644 OurUmbraco.Site/umbraco_client/Editors/EditContentType.js create mode 100644 OurUmbraco.Site/xslt/Web.config create mode 100644 uRelease/EventHandlers/FinalReleaseHandler.cs create mode 100644 uRepo/RepoStartupHandler.cs create mode 100644 uRepo/StarterKit.cs create mode 100644 uRepo/StarterKitController.cs diff --git a/.gitignore b/.gitignore index 52c83f28..8f927492 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ OurUmbraco.Site/App_Data/Meetup/searchresults.json OurUmbraco.Site/[Dd]ocumentation/ OurUmbraco.Site_419 OurUmbraco.Site/App_Data/cache/ +*.sln.ide/ diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index b1915ec2..2d76d13f 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -47,24 +47,25 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll False @@ -85,15 +86,17 @@ ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll False @@ -101,10 +104,11 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -122,10 +126,11 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll @@ -135,11 +140,11 @@ True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -149,6 +154,10 @@ True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + True + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll @@ -175,43 +184,43 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll - - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll diff --git a/Notification/packages.config b/Notification/packages.config index 36698cff..f3551c7c 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -1,25 +1,26 @@  - - + + - + + - + - + \ No newline at end of file diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index ba446da5..aa7f69f2 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -47,24 +47,25 @@ ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll + True - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll False @@ -85,15 +86,17 @@ ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll False @@ -101,10 +104,11 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -122,25 +126,28 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + @@ -185,43 +192,43 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll - - - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll - - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll - - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll + + + False + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 8a19db24..f0032a3b 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -1,12 +1,12 @@  - - + + - + @@ -16,11 +16,12 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 2d281314..8e9ff448 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -51,25 +51,25 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\businesslogic.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.7.1.2\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll - + False - ..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll + ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\cms.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\cms.dll - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.0\lib\controls.dll + True False @@ -113,13 +113,13 @@ False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll - + False - ..\packages\ImageProcessor.Web.3.3.0.0\lib\net45\ImageProcessor.Web.dll + ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\interfaces.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\interfaces.dll False @@ -127,7 +127,7 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\log4net.dll ..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll @@ -149,12 +149,12 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.ApplicationBlocks.Data.dll False - ..\packages\UmbracoCms.Core.7.1.6\lib\Microsoft.Web.Helpers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Microsoft.Web.Helpers.dll True @@ -174,7 +174,7 @@ False - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\dependencies\Our\our.mapR.dll @@ -194,22 +194,24 @@ False ..\dependencies\Our\SignalR.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\SQLCE4Umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\SQLCE4Umbraco.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.1.6\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\System.Data.SqlServerCe.Entity.dll + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + @@ -256,56 +258,52 @@ False - ..\packages\UmbracoCms.Core.7.1.6\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\TidyNet.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Core.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Core.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.DataLayer.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.DataLayer.dll ..\dependencies\Our\Umbraco.Ecommerce.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.editorControls.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.editorControls.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.MacroEngines.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.MacroEngines.dll ..\dependencies\Our\umbraco.presentation.xslt.Exslt.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.providers.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\umbraco.providers.dll ..\dependencies\Our\Umbraco.Support.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\Umbraco.Web.UI.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\Umbraco.Web.UI.dll - + False - ..\packages\UmbracoCms.Core.7.1.6\lib\umbraco.XmlSerializers.dll - - - False - ..\packages\UmbracoCms.Core.7.1.6\lib\UmbracoExamine.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\UmbracoExamine.dll False - ..\packages\UmbracoCms.Core.7.1.6\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.0\lib\UrlRewritingNet.UrlRewriter.dll ..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml new file mode 100644 index 00000000..50273483 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml @@ -0,0 +1,84 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates +@using Newtonsoft.Json.Linq + +@* + Razor helpers located at the bottom of this file +*@ + +@if (Model != null && Model.sections != null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) { +
+ @foreach (var row in section.rows) { + @renderRow(row, true); + } +
+ } + }else { +
+
+ @foreach (var s in Model.sections) { +
+
+ @foreach (var row in s.rows) { + @renderRow(row, false); + } +
+
+ } +
+
+ } +
+} + +@helper renderRow(dynamic row, bool singleColumn){ +
+ @Umbraco.If(singleColumn, "
") +
+ @foreach ( var area in row.areas ) { +
+
+ @foreach (var control in area.controls) { + if (control !=null && control.editor != null && control.editor.view != null ) { + @Html.Partial("grid/editors/base", (object)control) + } + } +
+
} +
+ @Umbraco.If(singleColumn, "
") +
+} + +@functions { + public static MvcHtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if(cfg != null) + foreach (JProperty property in cfg.Properties()) { + attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + } + + JObject style = contentItem.styles; + + if (style != null) { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); + + if (cssVals.Any()) + attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + } + + return new MvcHtmlString(string.Join(" ", attrs)); + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml new file mode 100644 index 00000000..a752042e --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml @@ -0,0 +1,84 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates +@using Newtonsoft.Json.Linq + +@* + Razor helpers located at the bottom of this file +*@ + +@if (Model != null && Model.sections != null) +{ + var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; + +
+ @if (oneColumn) + { + foreach (var section in Model.sections) { +
+ @foreach (var row in section.rows) { + @renderRow(row, true); + } +
+ } + }else { +
+
+ @foreach (var s in Model.sections) { +
+
+ @foreach (var row in s.rows) { + @renderRow(row, false); + } +
+
+ } +
+
+ } +
+} + +@helper renderRow(dynamic row, bool singleColumn){ +
+ @Umbraco.If(singleColumn, "
") +
+ @foreach ( var area in row.areas ) { +
+
+ @foreach (var control in area.controls) { + if (control !=null && control.editor != null && control.editor.view != null ) { + @Html.Partial("grid/editors/base", (object)control) + } + } +
+
} +
+ @Umbraco.If(singleColumn, "
") +
+} + +@functions { + public static MvcHtmlString RenderElementAttributes(dynamic contentItem) + { + var attrs = new List(); + JObject cfg = contentItem.config; + + if(cfg != null) + foreach (JProperty property in cfg.Properties()) { + attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + } + + JObject style = contentItem.styles; + + if (style != null) { + var cssVals = new List(); + foreach (JProperty property in style.Properties()) + cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); + + if (cssVals.Any()) + attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + } + + return new MvcHtmlString(string.Join(" ", attrs)); + } +} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml new file mode 100644 index 00000000..a86c0481 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Base.cshtml @@ -0,0 +1,24 @@ +@model dynamic +@using Umbraco.Web.Templates + +@functions { + public static string EditorView(dynamic contentItem) + { + string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString(); + view = view.ToLower().Replace(".html", ".cshtml"); + + if (!view.Contains("/")) { + view = "grid/editors/" + view; + } + + return view; + } +} +@try +{ + string editor = EditorView(Model); + @Html.Partial(editor, (object)Model) +} +catch (Exception ex) { +
@ex.ToString()
+} \ No newline at end of file diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml new file mode 100644 index 00000000..4fd66ddb --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Embed.cshtml @@ -0,0 +1,3 @@ +@model dynamic +@using Umbraco.Web.Templates +@Html.Raw(Model.value) diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml new file mode 100644 index 00000000..e0822808 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Macro.cshtml @@ -0,0 +1,17 @@ +@inherits UmbracoViewPage +@using Umbraco.Web.Templates + + +@if (Model.value != null) +{ + string macroAlias = Model.value.macroAlias.ToString(); + ViewDataDictionary parameters = new ViewDataDictionary(); + foreach (dynamic mpd in Model.value.macroParamsDictionary) + { + parameters.Add(mpd.Name, mpd.Value); + } + + + @Umbraco.RenderMacro(macroAlias, parameters) + +} diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml new file mode 100644 index 00000000..09d04219 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Media.cshtml @@ -0,0 +1,23 @@ +@model dynamic +@using Umbraco.Web.Templates + +@if (Model.value != null) +{ + var url = Model.value.image; + if(Model.editor.config != null && Model.editor.config.size != null){ + url += "?width=" + Model.editor.config.size.width; + url += "&height=" + Model.editor.config.size.height; + + if(Model.value.focalPoint != null){ + url += "¢er=" + Model.value.focalPoint.top +"," + Model.value.focalPoint.left; + url += "&mode=crop"; + } + } + + @Model.value.caption + + if (Model.value.caption != null) + { +

@Model.value.caption

+ } +} diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml new file mode 100644 index 00000000..d132e100 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Rte.cshtml @@ -0,0 +1,4 @@ +@model dynamic +@using Umbraco.Web.Templates + +@Html.Raw(TemplateUtilities.ParseInternalLinks(Model.value.ToString())) diff --git a/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml new file mode 100644 index 00000000..0cac4eb1 --- /dev/null +++ b/OurUmbraco.Site/Views/Partials/Grid/Editors/Textstring.cshtml @@ -0,0 +1,20 @@ +@model dynamic +@using Umbraco.Web.Templates + +@if (Model.editor.config.markup != null) +{ + string markup = Model.editor.config.markup.ToString(); + + markup = markup.Replace("#value#", Model.value.ToString()); + markup = markup.Replace("#style#", Model.editor.config.style.ToString()); + + + @Html.Raw(markup) + +} +else +{ + +
@Model.value
+
+} diff --git a/OurUmbraco.Site/config/ClientDependency.config b/OurUmbraco.Site/config/ClientDependency.config index e4160d06..2566920d 100644 --- a/OurUmbraco.Site/config/ClientDependency.config +++ b/OurUmbraco.Site/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + diff --git a/OurUmbraco.Site/config/splashes/noNodes.aspx b/OurUmbraco.Site/config/splashes/noNodes.aspx index b66780d8..38415e32 100644 --- a/OurUmbraco.Site/config/splashes/noNodes.aspx +++ b/OurUmbraco.Site/config/splashes/noNodes.aspx @@ -2,148 +2,67 @@ <%@ Import Namespace="Umbraco.Core.Configuration" %> <%@ Import Namespace="Umbraco.Core.IO" %> - - - + + + + + + + + + + + + + - + + - Umbraco - no pages found - " /> + - + - - - - - - - - - - - - - - - - - -
+ - +
+
+
+ -
+

Welcome to your Umbraco installation

+

You're seeing the wonderful page because your website doesn't contain any published content yet.

-
+ - - +
+
+

Easy start with Umbraco.tv

+

We have created a bunch of 'how-to' videos, to get you easily started with Umbraco. Learn how to build projects in just a couple of minutes. Easiest CMS in the world.

+ + Umbraco.tv → +
- +
+

Be a part of the community

+

The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, were sure that you can get your answers from the community.

+ + our.Umbraco → +
+
-
- - +
+
-
+
- - $.post("../../install/InstallerRestService.aspx?feed=developervids", - function(data) { - jQuery("#ajax-developervids").html(data); - }); - }); - - - - - -
-
-

Looks like there's still work to do

-

- You're seeing the wonderful page because your website doesn't contain any published content yet. -

-

- So get rid of this page by starting umbraco and publishing some content. You can do this by clicking the "set up your new website" button below. -

- -
-
-
-   -
-
- - - -
-
-
-
- - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- + \ No newline at end of file diff --git a/OurUmbraco.Site/config/tinyMceConfig.config b/OurUmbraco.Site/config/tinyMceConfig.config index 2cae6d6f..992103dd 100644 --- a/OurUmbraco.Site/config/tinyMceConfig.config +++ b/OurUmbraco.Site/config/tinyMceConfig.config @@ -216,8 +216,8 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al -tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class], thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style], --span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], --h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style], +-span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style], +-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style], dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*], param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]> @@ -227,6 +227,17 @@ param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|cla raw - GoogleSpellChecker.ashx + + { + "indentOnInit": false, + "path": "../../../../../umbraco_client/CodeMirror/Js", + "config": { + }, + "jsFiles": [ + ], + "cssFiles": [ + ] + } + \ No newline at end of file diff --git a/OurUmbraco.Site/config/trees.config b/OurUmbraco.Site/config/trees.config index 92e4f40c..a8b4ff45 100644 --- a/OurUmbraco.Site/config/trees.config +++ b/OurUmbraco.Site/config/trees.config @@ -22,7 +22,6 @@ - diff --git a/OurUmbraco.Site/config/uVersion.config b/OurUmbraco.Site/config/uVersion.config index 877de37a..9aab45be 100644 --- a/OurUmbraco.Site/config/uVersion.config +++ b/OurUmbraco.Site/config/uVersion.config @@ -9,6 +9,7 @@ + diff --git a/OurUmbraco.Site/config/umbracoSettings.config b/OurUmbraco.Site/config/umbracoSettings.config index 7d4f3852..268369d2 100644 --- a/OurUmbraco.Site/config/umbracoSettings.config +++ b/OurUmbraco.Site/config/umbracoSettings.config @@ -29,7 +29,8 @@ text - In Preview Mode - click to end]]> + + In Preview Mode - click to end]]> diff --git a/OurUmbraco.Site/images/our_logo.png b/OurUmbraco.Site/images/our_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..59d3511c4081af8b687c9517fcf6b11619a0d523 GIT binary patch literal 2481 zcmV;i2~PHjP)JxOAje6e-1~im8@%EUnfRt(H|vtw4B5NR;ek<7HnU z31l%V*<5WD&c%kB3@e2VnhE13isb!Bqk}gWbdl~1Sh`w!qDbB2B85K{N&JRLR44(D!nVM|E(X;7uzdz5X^O~(hedkUiuA7& z`Q1j5=c+`uR-SI=9-j4=i1g+HaJfikSTI~N?2`W#Dgo&^DKTS3N*+)(2-8=DBdt(m zp!n?8Z{O+TIjlEdq-wDSrfKbfO}J2~95a~m*RO!nJdL_H+a7Vl0MI`$+LeZYaT$g?k)P1m%l6a*^W0X4ZCy8{efx}c-8YaoGa6X;1FWXv<9vw_? zrhPYE$9At#U-a1)2gPPNFyFbLxXRu!OT2QC4s3r?q!UMf0>F~gu>nih2|2NYGcZ1D znHDBZfw~wRR%K_rNC#5b4r}y^q)a8$ao8Q72en?Ja4-MInzrU>k(L-Zz_Raz6Mwvd z^(0$M4FaNK)=bI>l%m$1tU!JQ*MT70V%2{ujvF5li5)|*9hg7#zoDkX4w|&pJ|?mW z%eZMJ21mk4j5_lJtb=_C=bNbnRPe{@HLY`%eFyit5){nbe?kN5w9i^m7EMs8F#_|z z*4|90f5R4-)i?s>4M~wmk4OPjs(H+UEyLgy>ZBd2wc)t6RAkTdBJb`IIj~D)M+cmv ziI&}g9(Je5QxD-Cw2il35;^#W$eS;SyifxmDip2OLLdZPj|N+Zc{X57?BxU-fQ@oc zV_@6N7Eum4pF%&WSt8Q#YYYZhGZbq}j*{ysRMX=}qf2LU?#+3C+e9TIu_ zWd&tKnq1G=40EMtsUPR z^01^8UR({e))s&hb^r5F5NvML!NO^^|JcwD&aa5Yw6vfe?X%snIrP*Z`I*H-^Mcl zRX?OkG$Gnn6lxn%yrV^AS2tFfSMRkz%}onbsrB%?t6zQmV>f)?3ozWT0MG^~v>reO zb97(yqEA|=Y6F!WE>eU^*Z&0c1jB&buz;&B?^L~KuAbcyWLu<&# zLP&?CfBKC&JPe2BOb1fiuu!4emnldOdf8_7CoK8S<*HT_pz5GV8GQX^tNLIo$@z{3 z%Q=bxQ~;nH2$J$m*3_Vbsx@6TV+PbhBg@4LSvb$ahMak=c4*erXP@fc#z|OHCVfa< zXN0OmAOaH9rLP>R>A?M?hZJfj6!T40FwT*8i_Yi!u1EqJx7V}ZrLW8sdh#^@n+A12 zoB_+4u7k_q_{ckfcF>DGuj(GHs}`iG9jmxwnJUC1K{qYZ)!7xN?SX$MKEjwsRi$kB z&AiUeg*j8N$7l5zD)oB@wM3#r^=2YIbyKcVDBq3hfMDDnjvuwn@HmRUOKYYU_0_yo z;aq_?%+s2Cr4?g7)G<`~8GIDxL6JO^Nj6kk3&qk<9!Zn&Z9h(oFp-zGIH+)344Xc| zhspR6kTyjJF`|5=H0Rsek>CGYP=oxdcJkV}nyO6}vL{~qnfv?bh^9RsFa`8=lLnme zEs-@>s}K|<`ZBJ*CtXdAhirc~q;X@FJoRd=C#H~U6)^WRG3h)lT1IY~CAN@l6-X8O zTNTnZfDgS-KCm>WwCgu5Q<%b83T9NYWx}i^jK|*hRdn>rj)7x#@P=GuNJ*S9NncKP zYRyo|>9qL!Si-aP3*cx_Cx5Y8Rr}W`dOd_xKfeJh46C^qJ4Mm$x|$i7Z!Uvg@3Fr}vCjI!uforsaQMrhyRA7Pj#mo9#9F^F}u6{ujA zE%51D;4F_3l}ze}!4PxiN1oTy7*K1x))u3o6SfByyiqJ%qi3x#orm@Y?R`U9dxS0q ze9>+Co&%!t%)pu}tx98^N_)*`i}%bg&+GBUv?{zQL(;!L10V;;kcUkdBd*+ zZrTI+0dT6rbEeDzxwJ80r;_4iV-hm&U}&0WdnGW7oeJecsJ>0W8#l z<~c!VOgZb3HDr3ylt3NDPtc5Taq$<8H^g%;C_boEu+bLGDn^ItPPJ*O9493pyY$*? z_1tx9K6mP**_0()pjZnO>3Ie7O&kI8e*W)1{#T{n)R$4rrjicXS2%&`#8x?)ft+UH zrm8Z0Zq&h;lq*zq_CcpmROlOkxZyM)@40^=^Cxx9NGi>LR;+5Q2P)?P9i%aP%}&kd ze2?j3{V+K8qiCbhP6Q4hPsoKp(Y^#rLbo3>kujZ&(!h-m02;_3<26C}+`x>}bTK&X z+KsSD3UuL6&cZNw0IHpk=&uFf7&!rrO|WLK<7}F!jDv~v?1rBO_+|=Kfd2=I19bsB zh;u*S2F)Z)11B^#Iso8|??i#JvZO8R~ v91p;D0tCO`JXN^25*Dt@-4pP29#H=QHDz^a-5iWr00000NkvXXu0mjfTt1wy literal 0 HcmV?d00001 diff --git a/OurUmbraco.Site/macroScripts/repository-view-category.cshtml b/OurUmbraco.Site/macroScripts/repository-view-category.cshtml index 343f0ebb..eb68c481 100644 --- a/OurUmbraco.Site/macroScripts/repository-view-category.cshtml +++ b/OurUmbraco.Site/macroScripts/repository-view-category.cshtml @@ -11,7 +11,11 @@ if(Request.QueryString["version"] != null){ version = Request.QueryString["version"].ToLower(); } - + + if (!string.IsNullOrEmpty(fullversion) && fullversion.Substring(0, 1) == "7") + { + version = "v7"; + } var ProjectsProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; var qs = Request.RawUrl.Substring( Request.RawUrl.IndexOf('?')+1 ).Replace("&category_id=" + id, ""); diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index f5a3c99f..16b6703e 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -2,12 +2,12 @@ - - + + - + @@ -19,14 +19,15 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml b/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml index 2e920de4..99ba4410 100644 --- a/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml +++ b/OurUmbraco.Site/umbraco/Views/AuthorizeUpgrade.cshtml @@ -55,7 +55,7 @@ @*And finally we can load in our angular app*@ - + diff --git a/OurUmbraco.Site/umbraco/Views/Default.cshtml b/OurUmbraco.Site/umbraco/Views/Default.cshtml index 2b3aa309..b17b8dfc 100644 --- a/OurUmbraco.Site/umbraco/Views/Default.cshtml +++ b/OurUmbraco.Site/umbraco/Views/Default.cshtml @@ -31,7 +31,7 @@ - +
diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html new file mode 100644 index 00000000..91b53f4d --- /dev/null +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/approvedcolorpicker.html @@ -0,0 +1,7 @@ +
+
+
+
+
+
\ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html index fb353723..55e0cad2 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/content/edit.html @@ -6,19 +6,21 @@
-

{{model.entity.name}}

+
@@ -26,31 +28,32 @@
diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html index 02865391..590b569f 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/insertmacro.html @@ -15,7 +15,11 @@
- diff --git a/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html b/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html index cb47826c..a1728f30 100644 --- a/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html +++ b/OurUmbraco.Site/umbraco/Views/common/dialogs/linkpicker.html @@ -29,14 +29,31 @@ - + + + +
- - + + + +
+ + +
+