diff --git a/umbraco/presentation/Web.PETER-MAC-PC.config b/umbraco/presentation/Web.PETER-MAC-PC.config new file mode 100644 index 0000000000..c7e7f457a1 --- /dev/null +++ b/umbraco/presentation/Web.PETER-MAC-PC.config @@ -0,0 +1,211 @@ + + + +
+ + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/umbraco/presentation/umbraco.presentation.csproj.orig b/umbraco/presentation/umbraco.presentation.csproj.orig new file mode 100644 index 0000000000..4534969f80 --- /dev/null +++ b/umbraco/presentation/umbraco.presentation.csproj.orig @@ -0,0 +1,3309 @@ + + + + 9.0.30729 + 2.0 + {651E1350-91B6-44B7-BD60-7207006D7003} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Debug + AnyCPU + + + + + umbraco + + + JScript + Grid + IE50 + false + Library + umbraco.presentation + OnBuildSuccess + + + + + + + SAK + SAK + SAK + SAK + 3.5 + v3.5 + + + + bin\ + false + 285212672 + false + + + DEBUG;TRACE + + + true + 4096 + false + + + false + false + false + false + 4 + full + prompt + AllRules.ruleset + + + bin\ + false + 285212672 + false + + + TRACE + bin\umbraco.xml + false + 4096 + false + + + true + false + false + false + 4 + none + prompt + AllRules.ruleset + + + + False + ..\..\foreign dlls\ClientDependency.Core.dll + + + False + ..\..\foreign dlls\CookComputing.XmlRpcV2.dll + + + False + ..\..\foreign dlls\Examine.dll + + + False + ..\..\foreign dlls\HtmlAgilityPack.dll + + + False + ..\..\foreign dlls\ICSharpCode.SharpZipLib.dll + + + C:\Users\Shannon\Documents\Visual Studio 2008\Projects\Umbraco\Branch-4.1\foreign dlls\Lucene.Net.dll + + + ..\..\foreign dlls\Nibble.Umb.ZipUpload.dll + + + System + + + + System.Data + + + + + System.Drawing + + + + System.Web + + + 3.5 + + + + + + + System.Web.Services + + + System.XML + + + + False + ..\..\foreign dlls\UmbracoExamine.dll + + + False + ..\..\foreign dlls\UrlRewritingNet.UrlRewriter.dll + + + {52AB8F1F-FB76-4E8C-885F-0747B6CE71EC} + umbraco.macroRenderings + + + {6EDD2061-82F2-461B-BB6E-879245A832DE} + umbraco.controls + + + umbraco.businesslogic + {E469A9CE-1BEC-423F-AC44-713CD72457EA} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + {CCD75EC3-63DB-4184-B49D-51C1DD337230} + umbraco.cms + + + {C7CB79F0-1C97-4B33-BFA7-00731B579AE2} + umbraco.datalayer + + + umbraco.interfaces + {511F6D8D-7717-440A-9A57-A507E9A8B27F} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + {D7636876-0756-43CB-A192-138C6F0D5E42} + umbraco.providers + + + + + Properties\SolutionInfo.cs + + + database.ascx + ASPXCodeBehind + + + database.ascx + + + + + + ASPXCodeBehind + + + + + + + + skinning.ascx + ASPXCodeBehind + + + skinning.ascx + + + loadStarterKitDesigns.ascx + ASPXCodeBehind + + + loadStarterKitDesigns.ascx + + + loadStarterKits.ascx + ASPXCodeBehind + + + loadStarterKits.ascx + + + + + p.aspx + ASPXCodeBehind + + + p.aspx + + + Code + + + + ASPXCodeBehind + booting.aspx + + + booting.aspx + + + noNodes.aspx + ASPXCodeBehind + + + noNodes.aspx + + + Code + + + default.aspx + ASPXCodeBehind + + + default.aspx + + + Global.asax + Code + + + Code + + + default.aspx + ASPXCodeBehind + + + default.aspx + + + defaultUser.ascx + ASPXCodeBehind + + + defaultUser.ascx + + + license.ascx + ASPXCodeBehind + + + license.ascx + + + renaming.ascx + ASPXCodeBehind + + + renaming.ascx + + + theend.ascx + ASPXCodeBehind + + + theend.ascx + + + upgrade.ascx + ASPXCodeBehind + + + upgrade.ascx + + + validatePermissions.ascx + ASPXCodeBehind + + + validatePermissions.ascx + + + welcome.ascx + ASPXCodeBehind + + + welcome.ascx + + + Title.ascx + ASPXCodeBehind + + + Title.ascx + + + Code + + + Code + + + Code + + + ASPXCodeBehind + + + Code + + + True + True + Settings.settings + + + Code + + + + + Code + + + Code + + + Code + + + Code + + + + + + + + + ASPXCodeBehind + + + Code + + + Code + + + Code + + + + Code + + + delete.aspx + ASPXCodeBehind + + + delete.aspx + + + editContent.aspx + ASPXCodeBehind + + + editContent.aspx + + + preview.aspx + ASPXCodeBehind + + + preview.aspx + + + publish.aspx + ASPXCodeBehind + + + publish.aspx + + + cacheBrowser.aspx + ASPXCodeBehind + + + cacheBrowser.aspx + + + code + + + Code + + + Code + + + + Code + + + + + + + + + ASPXCodeBehind + rsd.aspx + + + rsd.aspx + + + + ASPXCodeBehind + wlwmanifest.aspx + + + wlwmanifest.aspx + + + + + + + ImageViewer.ascx + ASPXCodeBehind + + + ImageViewer.ascx + + + ImageViewerUpdater.asmx + Component + + + UploadMediaImage.ascx + ASPXCodeBehind + + + UploadMediaImage.ascx + + + ContentTypeControlNew.ascx + ASPXCodeBehind + + + ContentTypeControlNew.ascx + + + + GenericProperty.ascx + ASPXCodeBehind + + + GenericProperty.ascx + + + + + + + passwordChanger.ascx + ASPXCodeBehind + + + passwordChanger.ascx + + + ASPXCodeBehind + ProgressBar.ascx + + + ProgressBar.ascx + + + + + + TreeControl.ascx + ASPXCodeBehind + + + TreeControl.ascx + + + + + + + + + DLRScripting.ascx + ASPXCodeBehind + + + DLRScripting.ascx + + + + + + + + + + + + + + + + + + + ChangePassword.ascx + ASPXCodeBehind + + + ChangePassword.ascx + + + DeveloperDashboardIntro.ascx + + + DeveloperDashboardVideos.ascx + + + FeedProxy.aspx + ASPXCodeBehind + + + FeedProxy.aspx + + + MediaDashboardIntro.ascx + + + MediaDashboardVideos.ascx + + + MembersDashboardIntro.ascx + + + MembersDashboardVideos.ascx + + + SettingsDashboardIntro.ascx + + + SettingsDashboardVideos.ascx + + + Applyskin.ascx + ASPXCodeBehind + + + Applyskin.ascx + + + StartupDashboardIntro.ascx + + + StartupDashboardKits.ascx + + + StartupDashboardVideos.ascx + + + StarterKits.aspx + ASPXCodeBehind + + + StarterKits.aspx + + + Preview.aspx + ASPXCodeBehind + + + Preview.aspx + + + TemplateSkinning.aspx + ASPXCodeBehind + + + TemplateSkinning.aspx + + + endPreview.aspx + ASPXCodeBehind + + + endPreview.aspx + + + helpRedirect.aspx + ASPXCodeBehind + + + helpRedirect.aspx + + + UmbracoCasingRules.aspx + ASPXCodeBehind + + + UmbracoCasingRules.aspx + + + Code + + + CssParser.aspx + ASPXCodeBehind + + + CssParser.aspx + + + ImageUploader.aspx + ASPXCodeBehind + + + ImageUploader.aspx + + + ModuleInjectionMacroRenderer.aspx + ASPXCodeBehind + + + ModuleInjectionMacroRenderer.aspx + + + ModuleInjector.aspx + ASPXCodeBehind + + + ModuleInjector.aspx + + + ModuleInstaller.aspx + ASPXCodeBehind + + + ModuleInstaller.aspx + + + ModuleSelector.ascx + ASPXCodeBehind + + + ModuleSelector.ascx + + + SkinCustomizer.ascx + ASPXCodeBehind + + + SkinCustomizer.ascx + + + + MemberSearch.ascx + ASPXCodeBehind + + + MemberSearch.ascx + + + + + + QuickSearch.ascx + ASPXCodeBehind + + + QuickSearch.ascx + + + xsltVisualize.aspx + ASPXCodeBehind + + + xsltVisualize.aspx + + + ExportCode.aspx + ASPXCodeBehind + + + ExportCode.aspx + + + insertMasterpageContent.aspx + ASPXCodeBehind + + + insertMasterpageContent.aspx + + + insertMasterpagePlaceholder.aspx + ASPXCodeBehind + + + insertMasterpagePlaceholder.aspx + + + mediaPicker.aspx + ASPXCodeBehind + + + mediaPicker.aspx + + + republish.aspx + ASPXCodeBehind + + + republish.aspx + + + search.aspx + ASPXCodeBehind + + + search.aspx + + + SendPublish.aspx + ASPXCodeBehind + + + SendPublish.aspx + + + create.aspx + ASPXCodeBehind + + + create.aspx + + + content.ascx + ASPXCodeBehind + + + content.ascx + + + Code + + + language.ascx + ASPXCodeBehind + + + language.ascx + + + media.ascx + ASPXCodeBehind + + + media.ascx + + + member.ascx + ASPXCodeBehind + + + member.ascx + + + nodeType.ascx + ASPXCodeBehind + + + nodeType.ascx + + + script.ascx + ASPXCodeBehind + + + script.ascx + + + simple.ascx + ASPXCodeBehind + + + simple.ascx + + + Code + + + xslt.ascx + ASPXCodeBehind + + + xslt.ascx + + + dashboard.aspx + ASPXCodeBehind + + + dashboard.aspx + + + LatestEdits.ascx + ASPXCodeBehind + + + LatestEdits.ascx + + + Default.aspx + ASPXCodeBehind + + + Default.aspx + + + assemblyBrowser.aspx + ASPXCodeBehind + + + assemblyBrowser.aspx + + + autoDoc.aspx + ASPXCodeBehind + + + autoDoc.aspx + + + editDatatype.aspx + ASPXCodeBehind + + + editDatatype.aspx + + + editMacro.aspx + ASPXCodeBehind + + + editMacro.aspx + + + BrowseRepository.aspx + ASPXCodeBehind + + + BrowseRepository.aspx + + + directoryBrowser.aspx + ASPXCodeBehind + + + directoryBrowser.aspx + + + editPackage.aspx + ASPXCodeBehind + + + editPackage.aspx + + + installedPackage.aspx + ASPXCodeBehind + + + installedPackage.aspx + + + LoadNitros.ascx + ASPXCodeBehind + + + LoadNitros.ascx + + + ASPXCodeBehind + SubmitPackage.aspx + + + SubmitPackage.aspx + + + editPython.aspx + ASPXCodeBehind + + + editPython.aspx + + + editXslt.aspx + ASPXCodeBehind + + + editXslt.aspx + + + getXsltStatus.asmx + Component + + + viewCacheItem.aspx + ASPXCodeBehind + + + viewCacheItem.aspx + + + xsltChooseExtension.aspx + ASPXCodeBehind + + + xsltChooseExtension.aspx + + + xsltInsertValueOf.aspx + ASPXCodeBehind + + + xsltInsertValueOf.aspx + + + about.aspx + ASPXCodeBehind + + + about.aspx + + + AssignDomain.aspx + ASPXCodeBehind + + + AssignDomain.aspx + + + create.aspx + ASPXCodeBehind + + + create.aspx + + + cruds.aspx + ASPXCodeBehind + + + cruds.aspx + + + editMacro.aspx + ASPXCodeBehind + + + editMacro.aspx + + + emptyTrashcan.aspx + ASPXCodeBehind + + + emptyTrashcan.aspx + + + exportDocumenttype.aspx + ASPXCodeBehind + + + imageViewer.aspx + ASPXCodeBehind + + + imageViewer.aspx + + + importDocumenttype.aspx + ASPXCodeBehind + + + insertMacro.aspx + ASPXCodeBehind + + + insertMacro.aspx + + + insertTable.aspx + ASPXCodeBehind + + + insertTable.aspx + + + moveOrCopy.aspx + ASPXCodeBehind + + + moveOrCopy.aspx + + + notifications.aspx + ASPXCodeBehind + + + notifications.aspx + + + installer.aspx + ASPXCodeBehind + + + installer.aspx + + + protectPage.aspx + ASPXCodeBehind + + + protectPage.aspx + + + publish.aspx + ASPXCodeBehind + + + publish.aspx + + + RegexWs.aspx + ASPXCodeBehind + + + RegexWs.aspx + + + rollBack.aspx + ASPXCodeBehind + + + rollBack.aspx + + + sendToTranslation.aspx + ASPXCodeBehind + + + sendToTranslation.aspx + + + treePicker.aspx + ASPXCodeBehind + + + treePicker.aspx + + + umbracoField.aspx + ASPXCodeBehind + + + umbracoField.aspx + + + uploadImage.aspx + ASPXCodeBehind + + + uploadImage.aspx + + + viewAuditTrail.aspx + ASPXCodeBehind + + + viewAuditTrail.aspx + + + editContent.aspx + ASPXCodeBehind + + + editContent.aspx + + + editMedia.aspx + ASPXCodeBehind + + + editMedia.aspx + + + language.aspx + ASPXCodeBehind + + + language.aspx + + + + + + + + + + + + + + + + + + + + + + + + + login.aspx + ASPXCodeBehind + + + login.aspx + + + logout.aspx + ASPXCodeBehind + + + logout.aspx + + + macroResultWrapper.aspx + ASPXCodeBehind + + + macroResultWrapper.aspx + + + default.Master + ASPXCodeBehind + + + default.Master + + + umbracoDialog.Master + ASPXCodeBehind + + + umbracoDialog.Master + + + umbracoPage.Master + ASPXCodeBehind + + + umbracoPage.Master + + + EditMember.aspx + ASPXCodeBehind + + + EditMember.aspx + + + EditMemberGroup.aspx + ASPXCodeBehind + + + EditMemberGroup.aspx + + + EditMemberType.aspx + ASPXCodeBehind + + + EditMemberType.aspx + + + search.aspx + ASPXCodeBehind + + + search.aspx + + + ViewMembers.aspx + ASPXCodeBehind + + + ViewMembers.aspx + + + Code + + + + ping.aspx + ASPXCodeBehind + + + ping.aspx + + + + + + InsertAnchor.aspx + ASPXCodeBehind + + + InsertAnchor.aspx + + + insertChar.aspx + ASPXCodeBehind + + + insertChar.aspx + + + insertImage.aspx + ASPXCodeBehind + + + insertImage.aspx + + + insertLink.aspx + ASPXCodeBehind + + + insertLink.aspx + + + insertMacro.aspx + ASPXCodeBehind + + + insertMacro.aspx + + + + + + tinymce3tinymceCompress.aspx + ASPXCodeBehind + + + tinymce3tinymceCompress.aspx + + + publishStatus.aspx + ASPXCodeBehind + + + publishStatus.aspx + + + QuickSearchHandler.ashx + + + DictionaryItemList.aspx + ASPXCodeBehind + + + DictionaryItemList.aspx + + + EditDictionaryItem.aspx + ASPXCodeBehind + + + EditDictionaryItem.aspx + + + editLanguage.aspx + ASPXCodeBehind + + + editLanguage.aspx + + + EditMediaType.aspx + ASPXCodeBehind + + + EditMediaType.aspx + + + EditNodeTypeNew.aspx + ASPXCodeBehind + + + EditNodeTypeNew.aspx + + + editTemplate.aspx + ASPXCodeBehind + + + editTemplate.aspx + + + ShowUmbracoTags.aspx + ASPXCodeBehind + + + ShowUmbracoTags.aspx + + + editScript.aspx + ASPXCodeBehind + + + editstylesheet.aspx + ASPXCodeBehind + + + editstylesheet.aspx + + + EditStyleSheetProperty.aspx + ASPXCodeBehind + + + EditStyleSheetProperty.aspx + + + sort.aspx + ASPXCodeBehind + + + sort.aspx + + + + + + Code + + + + + + + MacroContainerService.asmx + Component + + + TagsAutoCompleteHandler.ashx + + + TreeClientService.asmx + Component + + + + + + + + True + True + Resources.resx + + + test.aspx + ASPXCodeBehind + + + test.aspx + + + Code + + + canvas.aspx + ASPXCodeBehind + + + canvas.aspx + + + default.aspx + ASPXCodeBehind + + + default.aspx + + + details.aspx + ASPXCodeBehind + + + details.aspx + + + preview.aspx + ASPXCodeBehind + + + preview.aspx + + + xml.aspx + ASPXCodeBehind + + + xml.aspx + + + tree.aspx + ASPXCodeBehind + + + tree.aspx + + + treeInit.aspx + ASPXCodeBehind + + + treeInit.aspx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TreeDataService.ashx + + + + + + + + + XmlTree.xsd + + + umbraco.aspx + ASPXCodeBehind + + + umbraco.aspx + + + Code + + + + EditUser.aspx + ASPXCodeBehind + + + EditUser.aspx + + + EditUserType.aspx + ASPXCodeBehind + + + EditUserType.aspx + + + NodePermissions.ascx + ASPXCodeBehind + + + NodePermissions.ascx + + + PermissionEditor.aspx + ASPXCodeBehind + + + PermissionEditor.aspx + + + PermissionsHandler.asmx + Component + + + + + webService.asmx + Component + + + + CacheRefresher.asmx + Component + + + CheckForUpgrade.asmx + Component + + + CMSNode.asmx + Component + + + codeEditorSave.asmx + Component + + + Developer.asmx + Component + + + legacyAjaxCalls.asmx + Component + + + nodeSorter.asmx + Component + + + progressStatus.asmx + Component + + + publication.asmx + Component + + + + Settings.asmx + Component + + + templates.asmx + Component + + + trashcan.asmx + Component + + + UltimatePickerAutoCompleteHandler.ashx + + + ASPXCodeBehind + + + + + + + + + + + + + + + True + True + Reference.map + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + UserControl + + + UserControl + + + UserControl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SettingsSingleFileGenerator + Settings1.Designer.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UserControl + + + + + UserControl + + + + UserControl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + + Form + + + + Form + + + + Designer + + + + + + + + + + + + + + + + + + + + + Form + + + + + + + + Form + + + + Form + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + XmlTree.xsd + + + + + + + + + + + MSDiscoCodeGenerator + Reference.cs + + + Reference.map + + + database.ascx.cs + Designer + + + defaultUser.ascx.cs + Designer + + + theend.ascx.cs + Designer + + + validatePermissions.ascx.cs + Designer + + + welcome.ascx.cs + Designer + + + language.aspx.cs + Designer + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + + + + + + + + + package.xsd + + + umbraco.xsd + + + umbraco.xsd + + + umbraco.xsd + + + + Designer + + + + + + + + Dynamic + Web References\org.umbraco.update\ + http://update.umbraco.org/checkforupgrade.asmx + + + + + Settings + umbraco_org_umbraco_update_CheckForUpgrade + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + \ No newline at end of file diff --git a/umbraco/presentation/umbraco/config/lang/en.xml b/umbraco/presentation/umbraco/config/lang/en.xml index 451f8aa4fd..8ac3b77936 100644 --- a/umbraco/presentation/umbraco/config/lang/en.xml +++ b/umbraco/presentation/umbraco/config/lang/en.xml @@ -165,7 +165,7 @@ Restart Browse your website Visit - Click to hide this in the future + - Hide Content diff --git a/umbraco/presentation/umbraco/dashboard.aspx.cs b/umbraco/presentation/umbraco/dashboard.aspx.cs index 14f5cd8b62..b94f49286f 100644 --- a/umbraco/presentation/umbraco/dashboard.aspx.cs +++ b/umbraco/presentation/umbraco/dashboard.aspx.cs @@ -235,7 +235,7 @@ namespace umbraco.cms.presentation if (node.Attributes.GetNamedItem("showOnce") != null && node.Attributes.GetNamedItem("showOnce").Value.ToLower() == "true") { - onceLink.Text = "" + ui.Text("dashboard", "dontShowAgain") + ""; + onceLink.Text = "" + ui.Text("dashboard", "dontShowAgain") + ""; } return onceLink; } diff --git a/umbraco/presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx index 05ca9d072b..448dade455 100644 --- a/umbraco/presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx +++ b/umbraco/presentation/umbraco/dashboard/DeveloperDashboardIntro.ascx @@ -1,23 +1,36 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -

Start here

-

This section contains the tools to add advanced features to your Umbraco site

-

- From here you can explore and install packages, create macros, add data types, and much more. Start by exploring the below links or videos. -

-

Find out more

-
- Umbraco Start Up! +
+

+ Start here

+ Umbraco +

+ This section contains the tools to add advanced features to your Umbraco site

+

+ From here you can explore and install packages, create macros, add data types, and + much more. Start by exploring the below links or videos. +

+

+ Find out more:

+
+
+
+ +
-
- -
\ No newline at end of file +
+
diff --git a/umbraco/presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx b/umbraco/presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx index 994858ac57..dcd404e7d3 100644 --- a/umbraco/presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx +++ b/umbraco/presentation/umbraco/dashboard/DeveloperDashboardVideos.ascx @@ -105,11 +105,16 @@ +

Watch and learn

+ Videos +

Hours of Umbraco training videos are only a click away

Want to master Umbraco Macros and more? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

Loading... -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx index 0dfd45a87f..b541b26635 100644 --- a/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx +++ b/umbraco/presentation/umbraco/dashboard/MediaDashboardIntro.ascx @@ -1,22 +1,31 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -

Start here

-

Get started with Media right now

-

+

+

+ Start here

+ Umbraco +

+ Get started with Media right now

+

Use the tool below to upload a ZIP file of your images or documents to a media folder. -

-

Follow these steps:

-
- Umbraco Start Up! +

+

+ Follow these steps:

+
+
+
+
    +
  • Create a media folder by right-clicking on the Media root folder, selecting Create, + then give your folder a name, select the Media Type Folder, and click create
    • +
  • Select the created folder by click the Choose link
    • +
  • Use the Browse button below to select a ZIP file containing your images (you can + even organize them into folders and the tool will create these for you)
    • +
  • Click the Upload zip file button
    • +
  • Refresh the Media section by right-clicking the Media root folder and selecting + Reload Nodes
    • +
+
-
-
    -
  • Create a media folder by right-clicking on the Media root folder, selecting Create, then give your folder a name, select the Media Type Folder, and click create
    • -
  • Select the created folder by click the Choose link
    • -
  • Use the Browse button below to select a ZIP file containing your images (you can even organize them into folders and the tool will create these for you)
    • -
  • Click the Upload zip file button
    • -
  • Refresh the Media section by right-clicking the Media root folder and selecting Reload Nodes
    • -
-
\ No newline at end of file +
+
diff --git a/umbraco/presentation/umbraco/dashboard/MediaDashboardVideos.ascx b/umbraco/presentation/umbraco/dashboard/MediaDashboardVideos.ascx index 034e6c07ab..dd3e0d26c5 100644 --- a/umbraco/presentation/umbraco/dashboard/MediaDashboardVideos.ascx +++ b/umbraco/presentation/umbraco/dashboard/MediaDashboardVideos.ascx @@ -104,12 +104,16 @@ - +

Watch and learn

+ Videos +

Hours of Umbraco training videos are only a click away

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

Loading... +
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/MembersDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/MembersDashboardIntro.ascx index 7c70b2890a..2ca8c7d02c 100644 --- a/umbraco/presentation/umbraco/dashboard/MembersDashboardIntro.ascx +++ b/umbraco/presentation/umbraco/dashboard/MembersDashboardIntro.ascx @@ -1,18 +1,25 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -

Start here

-

Get started with Members right now

-

+

+

+ Start here

+ Umbraco +

+ Get started with Members right now

+

Use the tool below to search for an existing member. -

-

More about members

-
- Umbraco Start Up! +

+

+ More about members

+
+
+
+ +
-
- -
\ No newline at end of file +
+
diff --git a/umbraco/presentation/umbraco/dashboard/MembersDashboardVideos.ascx b/umbraco/presentation/umbraco/dashboard/MembersDashboardVideos.ascx index 94d0a9cc71..539c3c8822 100644 --- a/umbraco/presentation/umbraco/dashboard/MembersDashboardVideos.ascx +++ b/umbraco/presentation/umbraco/dashboard/MembersDashboardVideos.ascx @@ -104,12 +104,16 @@ - +

Watch and learn

+ Videos +

Hours of Umbraco training videos are only a click away

Want to master Umbraco Members? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

Loading... -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/SettingsDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/SettingsDashboardIntro.ascx index 07cf03a301..3c78009f3f 100644 --- a/umbraco/presentation/umbraco/dashboard/SettingsDashboardIntro.ascx +++ b/umbraco/presentation/umbraco/dashboard/SettingsDashboardIntro.ascx @@ -1,23 +1,36 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - -

Start here

-

This section contains the building blocks for your Umbraco site

-

- Follow the below links to find out more about working with the items in the Setings section: -

-

Find out more

-
- Umbraco Start Up! +
+

+ Start here

+ Umbraco +

+ This section contains the building blocks for your Umbraco site

+

+ Follow the below links to find out more about working with the items in the Setings + section: +

+

+ Find out more:

+
+
+
+ +
-
- -
\ No newline at end of file +
+
diff --git a/umbraco/presentation/umbraco/dashboard/SettingsDashboardVideos.ascx b/umbraco/presentation/umbraco/dashboard/SettingsDashboardVideos.ascx index e075558bef..5b6eaa7255 100644 --- a/umbraco/presentation/umbraco/dashboard/SettingsDashboardVideos.ascx +++ b/umbraco/presentation/umbraco/dashboard/SettingsDashboardVideos.ascx @@ -104,12 +104,16 @@ - +

Watch and learn

+ Videos +

Hours of Umbraco training videos are only a click away

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

Loading... +
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/StartupDashboardIntro.ascx b/umbraco/presentation/umbraco/dashboard/StartupDashboardIntro.ascx index 6c8afa9d0d..7e99d4f261 100644 --- a/umbraco/presentation/umbraco/dashboard/StartupDashboardIntro.ascx +++ b/umbraco/presentation/umbraco/dashboard/StartupDashboardIntro.ascx @@ -1,25 +1,62 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> +
+

Start Here

+ Umbraco +

Thank you for choosing Umbraco!

+

+ We think this could be the beginning of something beautiful. You have made a great + choice, to help you get started here are some links to addtional information: +

+

+ Find out more:

-

Start Here

-

Thank you for choosing Umbraco!

-

- We think this could be the beginning of something beautiful. You have made a great choice, to help you get started here are some links to addtional information: -

-

Find out more

-
- Umbraco Start Up! +
+
+
+

+ New to Umbraco

+ +
+
+

+ Go further

+ +
+
+

+ Get support

+ +
-
- -
\ No newline at end of file +
+
diff --git a/umbraco/presentation/umbraco/dashboard/StartupDashboardKits.ascx b/umbraco/presentation/umbraco/dashboard/StartupDashboardKits.ascx index d2a346062a..daccd74497 100644 --- a/umbraco/presentation/umbraco/dashboard/StartupDashboardKits.ascx +++ b/umbraco/presentation/umbraco/dashboard/StartupDashboardKits.ascx @@ -1,22 +1,25 @@ <%@ Control Language="C#" AutoEventWireup="true" %> <%@ Register Namespace="umbraco.uicontrols" Assembly="controls" TagPrefix="umb" %> - +

Make it look great

+ Umbraco Starter Kits Rock!

Install a Starter Site and Skin

If you haven't already installed one of our Starter Kits, we think you should do that now. This is one of the best ways to start working with Umbraco. After you install a Starter Kit, you can select a skin to make it look great and customize the kit to your liking.

-

Starter Kits

-
- Umbraco Starter Kits Rock! +

Starter Kits:

+
+
+
+ +
+
-
- -
\ No newline at end of file +
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/StartupDashboardVideos.ascx b/umbraco/presentation/umbraco/dashboard/StartupDashboardVideos.ascx index 034e6c07ab..dd3e0d26c5 100644 --- a/umbraco/presentation/umbraco/dashboard/StartupDashboardVideos.ascx +++ b/umbraco/presentation/umbraco/dashboard/StartupDashboardVideos.ascx @@ -104,12 +104,16 @@ - +

Watch and learn

+ Videos +

Hours of Umbraco training videos are only a click away

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

To get you started:

Loading... +
\ No newline at end of file diff --git a/umbraco/presentation/umbraco/dashboard/images/TV.png b/umbraco/presentation/umbraco/dashboard/images/TV.png new file mode 100644 index 0000000000..ce85585b28 Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/TV.png differ diff --git a/umbraco/presentation/umbraco/dashboard/images/ZipFile.png b/umbraco/presentation/umbraco/dashboard/images/ZipFile.png new file mode 100644 index 0000000000..4ba5a52877 Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/ZipFile.png differ diff --git a/umbraco/presentation/umbraco/dashboard/images/logo32x32.png b/umbraco/presentation/umbraco/dashboard/images/logo32x32.png new file mode 100644 index 0000000000..5d92b25b8e Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/logo32x32.png differ diff --git a/umbraco/presentation/umbraco/dashboard/images/membersearch.png b/umbraco/presentation/umbraco/dashboard/images/membersearch.png new file mode 100644 index 0000000000..07f78f7517 Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/membersearch.png differ diff --git a/umbraco/presentation/umbraco/dashboard/images/starterkit32x32.png b/umbraco/presentation/umbraco/dashboard/images/starterkit32x32.png new file mode 100644 index 0000000000..3e8d3d2ff6 Binary files /dev/null and b/umbraco/presentation/umbraco/dashboard/images/starterkit32x32.png differ diff --git a/umbraco/presentation/umbraco/dashboard/zipupload.ascx b/umbraco/presentation/umbraco/dashboard/zipupload.ascx index 9bb50263de..35d877daf9 100644 --- a/umbraco/presentation/umbraco/dashboard/zipupload.ascx +++ b/umbraco/presentation/umbraco/dashboard/zipupload.ascx @@ -1,6 +1,19 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="zipupload.ascx.cs" Inherits="Nibble.Umb.ZipUpload.zipupload" %> - - - - - +
+

+ Zip Upload

+ Umbraco +

+ Quickly upload an archive of media assets to Umbraco.

+
+
+
+ + + + + +
+
+
+
diff --git a/umbraco/presentation/umbraco/images/listItemOrange.gif b/umbraco/presentation/umbraco/images/listItemOrange.gif new file mode 100644 index 0000000000..ab6bef08c6 Binary files /dev/null and b/umbraco/presentation/umbraco/images/listItemOrange.gif differ diff --git a/umbraco/presentation/umbraco/members/MemberSearch.ascx b/umbraco/presentation/umbraco/members/MemberSearch.ascx index 6e27d28c7a..9bb9863be2 100644 --- a/umbraco/presentation/umbraco/members/MemberSearch.ascx +++ b/umbraco/presentation/umbraco/members/MemberSearch.ascx @@ -1,12 +1,12 @@ <%@ Control Language="C#" AutoEventWireup="True" CodeBehind="MemberSearch.ascx.cs" Inherits="umbraco.presentation.umbraco.members.MemberSearch" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - - -

Member Search

+
+

Member Search

+ Videos

- + @@ -36,4 +36,5 @@ - + +
diff --git a/umbraco/presentation/umbraco/members/MemberSearch.ascx.designer.cs b/umbraco/presentation/umbraco/members/MemberSearch.ascx.designer.cs index e2433c876f..5a80e4c929 100644 --- a/umbraco/presentation/umbraco/members/MemberSearch.ascx.designer.cs +++ b/umbraco/presentation/umbraco/members/MemberSearch.ascx.designer.cs @@ -12,15 +12,6 @@ namespace umbraco.presentation.umbraco.members { public partial class MemberSearch { - /// - /// pane1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::umbraco.uicontrols.Pane pane1; - /// /// searchQuery control. /// diff --git a/umbraco/presentation/umbraco/members/search.aspx b/umbraco/presentation/umbraco/members/search.aspx index 856378e77c..2bb21660f0 100644 --- a/umbraco/presentation/umbraco/members/search.aspx +++ b/umbraco/presentation/umbraco/members/search.aspx @@ -3,7 +3,11 @@ <%@ Register Src="~/umbraco/members/MemberSearch.ascx" TagName="MemberSearch" TagPrefix="umb" %> - - + + + + + + diff --git a/umbraco/presentation/umbraco/members/search.aspx.designer.cs b/umbraco/presentation/umbraco/members/search.aspx.designer.cs index fec7c23351..115302af0d 100644 --- a/umbraco/presentation/umbraco/members/search.aspx.designer.cs +++ b/umbraco/presentation/umbraco/members/search.aspx.designer.cs @@ -13,12 +13,12 @@ namespace umbraco.presentation.members { public partial class search { /// - /// panel1 control. + /// Panel2 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::umbraco.uicontrols.UmbracoPanel panel1; + protected global::umbraco.uicontrols.UmbracoPanel Panel2; } } diff --git a/umbraco/presentation/umbraco_client/ui/default.css b/umbraco/presentation/umbraco_client/ui/default.css index b7b2b302bc..a285aba175 100644 --- a/umbraco/presentation/umbraco_client/ui/default.css +++ b/umbraco/presentation/umbraco_client/ui/default.css @@ -568,9 +568,139 @@ guiEditor { } /* DASHBOARD */ + +.dashboardWrapper +{ + padding:5px 5px 5px 5px; + overflow:hidden; + color:#333; +} + +.dashboardWrapper p +{ + font-size:1.1em; + margin-top:0; +} + +.dashboardWrapper h2 +{ + margin-top:0; + padding-bottom:10px; + border-bottom:1px solid #ccc; + padding-left:37px; + line-height:32px; +} + +.dashboardWrapper h3 +{ + margin-bottom:10px; +} + +.dashboardWrapper h4 +{ + +} + +.dashboardIcon +{ + position:absolute; + top:10px; + left:10px; +} + +.dashboardColWrapper +{ + position:relative; + overflow:hidden; +} + +.dashboardColWrapper h3 +{ + margin-bottom:0; +} + +.dashboardColWrapper ul +{ + margin-left:1.5em; + margin-right:1.5em; + padding:0; + list-style-image:url(/umbraco/images/listitemorange.gif); +} + +.dashboardColWrapper li +{ + line-height:1.2em; + font-size:1.1em; + padding-bottom:.5em; +} + + +.dashboardCols +{ + +} + +.dashboardCol +{ + position:relative; + padding:10px 1%; + background: url(/umbraco_client/propertypane/images/propertyBackground.gif) repeat-x scroll center top #FFFFFF; +} + + + +.third +{ + width:30.33%; + float:left; + margin-right:1%; +} + +.dashboardCols .last +{ + margin-right:0; +} + +.dashboardCols h3 +{ + margin-top:0; + padding-bottom:5px; + border-bottom:1px solid #ccc; +} + + + .dashboardHideLink { - float: right; + /*float: right; color: #aaa; - text-decoration: none; + text-decoration: none;*/ + + position:absolute; + right:10px; + top:10px; + text-decoration:none; + color:#666; + border:none; + font-size:.9em; + font-weight:bold; + padding:5px; + margin:0; + border-radius:3px; + border:1px solid #ccc; + -moz-border-radius:3px; + -webkit-border-radius:3px; + background-color:#ddd; + background: -moz-linear-gradient(100% 100% 90deg, #ddd, #fefefe); + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fefefe), to(#ddd)); + +} + +.dashboardHideLink:hover +{ + text-decoration:none; + background-color:#fefefe; + background: -moz-linear-gradient(100% 100% 90deg, #fefefe, #ddd); + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ddd), to(#fefefe)); + cursor:pointer; } \ No newline at end of file diff --git a/umbraco/presentation/web.config.PETER-MAC-PC.xslt b/umbraco/presentation/web.config.PETER-MAC-PC.xslt index 8fc57912ba..ad2e6e3b06 100644 --- a/umbraco/presentation/web.config.PETER-MAC-PC.xslt +++ b/umbraco/presentation/web.config.PETER-MAC-PC.xslt @@ -8,7 +8,7 @@ - + 4.6.beta