From 52d78533ae9efee158b2d5bc5701dc1b3174c595 Mon Sep 17 00:00:00 2001 From: TimGeyssens Date: Tue, 3 Mar 2015 10:07:00 +0100 Subject: [PATCH] Cleans up marketplace project and renames it to uProject --- .../Api/ProjectContributionController.cs | 4 +- Marketplace/Api/ProjectForumController.cs | 4 +- Marketplace/Controls/CountryDropDown.cs | 56 - Marketplace/Css/Custom.css | 522 ----- Marketplace/Css/Deli.css | 1190 ----------- Marketplace/Css/DeliAdmin.css | 39 - Marketplace/Css/community.css | 761 ------- Marketplace/Css/fonts.css | 109 -- Marketplace/Css/repository.css | 181 -- Marketplace/Css/screen.css | 1742 ----------------- Marketplace/Extensions.cs | 2 +- Marketplace/Helpers/ExtensionMethods.cs | 2 +- Marketplace/Helpers/Helper.cs | 4 +- .../ConfigureProjectLicenses.master | 13 - Marketplace/MasterPages/Deli.master | 40 - Marketplace/MasterPages/DeliCart.master | 20 - .../MasterPages/DeliCartDetails.master | 19 - Marketplace/MasterPages/EditProject.master | 25 - Marketplace/MasterPages/Master.master | 146 -- Marketplace/MasterPages/PayPalRedirect.master | 38 - Marketplace/MasterPages/Project.master | 44 - Marketplace/MasterPages/ProjectGroup.master | 38 - Marketplace/MasterPages/Projects.master | 68 - Marketplace/MasterPages/ProjectsTags.master | 22 - .../MasterPages/Repository/Community.master | 98 - .../MasterPages/Repository/Master.master | 99 - .../MasterPages/Repository/Nothing.master | 34 - .../MasterPages/Repository/Project.master | 11 - .../Repository/ProjectGroup.master | 32 - .../MasterPages/Repository/Projects.master | 47 - .../Repository/ProjectsTags.master | 21 - .../MasterPages/Repository/Textpage.master | 10 - Marketplace/MasterPages/newest.master | 14 - Marketplace/MasterPages/popular.master | 14 - Marketplace/Models/ProjectContributor.cs | 2 +- Marketplace/Models/ProjectForum.cs | 2 +- Marketplace/ProjectFileUploadHandler.cs | 3 +- Marketplace/Properties/Settings.Designer.cs | 2 +- Marketplace/Razor/Deli-MyProjects.cshtml | 95 - .../Razor/Deli-ProjectCategories.cshtml | 22 - Marketplace/Razor/Deli-TagCloud.cshtml | 33 - .../Razor/VersionCompatibilityReport.cs | 92 - Marketplace/Razor/versionCompatibility.cshtml | 46 - .../Razor/versionCompatibilityReport.cshtml | 26 - Marketplace/Services/ContributionService.cs | 4 +- Marketplace/Singleton.cs | 2 +- Marketplace/library.cs | 2 +- .../{Marketplace.csproj => uProject.csproj} | 56 - Marketplace/uVersion/config.cs | 2 +- Marketplace/uVersion/uVersion.cs | 2 +- .../usercontrols/Deli/Package/Editor.ascx.cs | 4 +- .../Deli/Package/Editor.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Complete.ascx.cs | 4 +- .../Package/Steps/Complete.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Details.ascx.cs | 4 +- .../Package/Steps/Details.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Files.ascx.cs | 4 +- .../Deli/Package/Steps/Files.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Licenses.ascx.cs | 4 +- .../Package/Steps/Licenses.ascx.designer.cs | 2 +- .../Deli/Package/Steps/Screenshots.ascx.cs | 4 +- .../Steps/Screenshots.ascx.designer.cs | 2 +- .../Deli/Profile/MyProjects.ascx.cs | 2 +- .../Deli/Profile/MyProjects.ascx.designer.cs | 2 +- .../usercontrols/Deli/Profile/Signup.ascx | 312 --- .../usercontrols/Deli/Profile/Signup.ascx.cs | 297 --- .../Deli/Profile/Signup.ascx.designer.cs | 465 ----- .../our.umbraco.org/HeaderLogin.ascx | 12 - .../Login_novalidationscript.ascx | 20 - .../Login_novalidationscript.ascx.cs | 46 - .../Login_novalidationscript.ascx.designer.cs | 78 - .../umbracoMemberControls/umbLogin.ascx | 27 - .../packages/created/createdPackages.config | 52 + OurUmbraco.Site/OurUmbraco.Site.csproj | 4 +- .../Members/ProfileProjectTeam.cshtml | 4 +- our.umbraco.org.sln | 2 +- 76 files changed, 96 insertions(+), 7123 deletions(-) delete mode 100644 Marketplace/Controls/CountryDropDown.cs delete mode 100644 Marketplace/Css/Custom.css delete mode 100644 Marketplace/Css/Deli.css delete mode 100644 Marketplace/Css/DeliAdmin.css delete mode 100644 Marketplace/Css/community.css delete mode 100644 Marketplace/Css/fonts.css delete mode 100644 Marketplace/Css/repository.css delete mode 100644 Marketplace/Css/screen.css delete mode 100644 Marketplace/MasterPages/ConfigureProjectLicenses.master delete mode 100644 Marketplace/MasterPages/Deli.master delete mode 100644 Marketplace/MasterPages/DeliCart.master delete mode 100644 Marketplace/MasterPages/DeliCartDetails.master delete mode 100644 Marketplace/MasterPages/EditProject.master delete mode 100644 Marketplace/MasterPages/Master.master delete mode 100644 Marketplace/MasterPages/PayPalRedirect.master delete mode 100644 Marketplace/MasterPages/Project.master delete mode 100644 Marketplace/MasterPages/ProjectGroup.master delete mode 100644 Marketplace/MasterPages/Projects.master delete mode 100644 Marketplace/MasterPages/ProjectsTags.master delete mode 100644 Marketplace/MasterPages/Repository/Community.master delete mode 100644 Marketplace/MasterPages/Repository/Master.master delete mode 100644 Marketplace/MasterPages/Repository/Nothing.master delete mode 100644 Marketplace/MasterPages/Repository/Project.master delete mode 100644 Marketplace/MasterPages/Repository/ProjectGroup.master delete mode 100644 Marketplace/MasterPages/Repository/Projects.master delete mode 100644 Marketplace/MasterPages/Repository/ProjectsTags.master delete mode 100644 Marketplace/MasterPages/Repository/Textpage.master delete mode 100644 Marketplace/MasterPages/newest.master delete mode 100644 Marketplace/MasterPages/popular.master delete mode 100644 Marketplace/Razor/Deli-MyProjects.cshtml delete mode 100644 Marketplace/Razor/Deli-ProjectCategories.cshtml delete mode 100644 Marketplace/Razor/Deli-TagCloud.cshtml delete mode 100644 Marketplace/Razor/VersionCompatibilityReport.cs delete mode 100644 Marketplace/Razor/versionCompatibility.cshtml delete mode 100644 Marketplace/Razor/versionCompatibilityReport.cshtml rename Marketplace/{Marketplace.csproj => uProject.csproj} (89%) delete mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx delete mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs delete mode 100644 Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs delete mode 100644 Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx delete mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx delete mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs delete mode 100644 Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs delete mode 100644 Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx diff --git a/Marketplace/Api/ProjectContributionController.cs b/Marketplace/Api/ProjectContributionController.cs index 776f3439..54c9eb85 100644 --- a/Marketplace/Api/ProjectContributionController.cs +++ b/Marketplace/Api/ProjectContributionController.cs @@ -1,4 +1,4 @@ -using Marketplace.Services; +using uProject.Services; using System; using System.Collections.Generic; using System.Dynamic; @@ -10,7 +10,7 @@ using System.Web.Http; using Umbraco.Web; using Umbraco.Web.WebApi; -namespace Marketplace.Api +namespace uProject.Api { [MemberAuthorize(AllowType = "member")] public class ProjectContributionController : UmbracoApiController diff --git a/Marketplace/Api/ProjectForumController.cs b/Marketplace/Api/ProjectForumController.cs index 5e88f74a..94dbdd78 100644 --- a/Marketplace/Api/ProjectForumController.cs +++ b/Marketplace/Api/ProjectForumController.cs @@ -1,4 +1,4 @@ -using Marketplace.Models; +using uProject.Models; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +8,7 @@ using System.Web; using Umbraco.Web; using Umbraco.Web.WebApi; -namespace Marketplace.Api +namespace uProject.Api { [MemberAuthorize(AllowType = "member")] public class ProjectForumController : UmbracoApiController diff --git a/Marketplace/Controls/CountryDropDown.cs b/Marketplace/Controls/CountryDropDown.cs deleted file mode 100644 index fb7bedfe..00000000 --- a/Marketplace/Controls/CountryDropDown.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -using System.Collections.Generic; -using System.Web; -using System.Linq; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Web.UI.HtmlControls; -using System.Collections.Specialized; -using System.Globalization; - -namespace Marketplace.Controls -{ - public class CountryDropDownList : DropDownList - { - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - GetCountries(); - - } - - - private void GetCountries() - { - - Dictionary dic = new Dictionary(); - List col = new List(); - - foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.SpecificCultures)) - { - - RegionInfo ri = new RegionInfo(ci.LCID); - if (!dic.ContainsKey(ri.EnglishName)) - dic.Add(ri.EnglishName, ri.TwoLetterISORegionName.ToLowerInvariant()); - - if (!col.Contains(ri.EnglishName)) - col.Add(ri.EnglishName); - } - - col.Sort(); - - - - this.Items.Add(new ListItem("", "")); - foreach (var i in dic.OrderBy(x => x.Key)) - { - this.Items.Add(new ListItem(i.Key, i.Value)); - } - - } - } -} \ No newline at end of file diff --git a/Marketplace/Css/Custom.css b/Marketplace/Css/Custom.css deleted file mode 100644 index d666f39d..00000000 --- a/Marketplace/Css/Custom.css +++ /dev/null @@ -1,522 +0,0 @@ -/* THIS STYLESHEET CONTAINS ALL THE THINGS WE'VE ADDED TO THE DESIGN */ - -/* adjusting the header if there is no promoted content */ - - -.Class-VideoTutorial h1{display: none !Important;} - -.class-empty #wrapper{padding-top: 150px !Important;} -.class-emtpy #header{height: 150px !Important;} - -.class-shopFlow #wrapper{padding-top: 200px !Important;} -.class-shopFlow #header{padding-left: 0px; height: 200px !Important;} -.class-shopFlow .breadcrumb{display: none !Important;} - -#panes div.tabPanel{display: none;} - -.get-started-table td {vertical-align: top; width: 33%;} -.get-started-table li {margin-bottom: 5px;} -.get-started-table ul {margin: 0;} -td {vertical-align: top;} -.no-margin {margin:0;} -.boxLeft { -float: left; -width: 48% -} -.boxRight { -float: right; -width: 48% -} - -/* SUBMITTED SITES */ -#tagSelector{height: 130px; display: block; list-style: none; -margin-bottom: 20px; padding: 0px;} - -#tagSelector li{float: left; margin: 0px; display: block; width: 180px; padding: 5px;} -#tagSelector li a{padding: 3px;} -#tagSelector li a.current{font-weight: bold;} -#tagSelector li.header{width: 100%; float: none; color: #444444; font-weight: bold; text-size: 12px;} - -#viewToggle{text-align: center; display: block; width: 120px; padding: 6px; border: solid 1px #e7e7e7; text-decoration: none; clear: both; margin-bottom: 20px; } - -#featuredSites{display: block; margin: 0px; padding: 0px;} - -#featuredSites li{display: block; text-align: center; width: 297px; height: 270px; float: left; margin: 0px 10px 14px 0px; padding: 7px; -border-top: 1px solid #E7E7E7; -border-left: 1px solid #E7E7E7; -border-right: 2px solid #E7E7E7; -border-bottom: 2px solid #E7E7E7; -overflow: hidden -} - -#sites.grid{display: block; margin: 0px; padding: 0px;} -#sites.grid li{opacity:0.2; display: block; text-align: center; width: 135px; height: 145px; float: left; margin: 0px 20px 20px 0px; padding: 0px; - background: #252525; color: #fff; - overflow: hidden -} - -#sites.grid li.last{margin-right: 0px; clear: right;} -#sites.grid li a.thumb{color: #fff; display: block; margin: auto; background: #fff no-repeat top center; width: 136px; padding-top: 101px; height: 1px; overflow: hidden;} -#sites.grid li h5{margin-top: 3px; padding: 5px; font-size: 11px; font-weight: normal; color: #fff;} -#sites.grid li h5 a{color: #fff;} -#sites.grid li p{display: none;} -#sites.grid li.show{opacity: 0.99;} - -#sites.list{background: none !Important; display: block; margin: 0px; padding: 0px; width: auto; list-style: none;} - -#sites.list li{background: none !Important; opacity: 0.99 !Important; display: none; border-bottom: 1px solid #ccc; text-align: left; -padding: 10px 10px 10px 150px; position: relative; min-height: 90px; height: auto !Important; height: 90px;} - -#sites.list li a.thumb{display: block; border: 1px solid #999; background: no-repeat top center; width: 115px; padding-top: 81px; height: 1px; -overflow: hidden; position: absolute; top: 15px; left: 10px;} - -#sites.list li h5{margin: 2px 0px 5px 0px; padding: 2px; font-size: 16px;} - -#sites.list li p{} -#sites.list li.show{opacity: 0.99 !Important; display: block;} - -div#showcase{width: 750px; height: 470px; overflow: auto; padding: 5px;} -div#showcase div.image{margin: 0px 0px 20px 20px; width: 450px; height: 280px; overflow: hidden; border: 1px solid #ccc; text-align: center; -position: absolute; top: 20px; right:0px; -} -div#showcase h1{float: left; color: #575757; width: 280px;} - -div#showcase div.desc{overflow: auto; position: absolute; bottom: 0px; height: 125px; -padding: 7px; border-top: #e7e7e7 1px solid; margin-top: 35px; width: 745px;} - -div#showcase div.desc p{font-size: 12px !Important; line-height: 20px;} - -div#showcase dl{clear: left;} -div#showcase dt{font-weight: bold;} -div#showcase dd{margin-bottom: 10px;} - -/* FAQ */ -.faqGroup{list-style: none; margin: 0; padding: 0px;} -.faqGroup li{display: block; width: 350px; height: 100px; float: left; margin:0px 20px 30px 0px;} -.faqGroup li h3{margin: 5px 0 0 0; padding: 0px;} -.faqGroup li p{padding-top: 10px; margin: 0px; } -.faqGroup li.alt{float: right; } -.faqGroup h3 a{color: #000 !Important; text-decoration: none !Important;} -.faqGroup a:hover h3{color: #000; text-decoration: underline !Important;} - -.faqGroupFeatureLink li{display: block; width: 150px; float: left; margin:0px 10px 15px 0px;} -.faqGroupFeatureLink a{color: #000 !Important; text-decoration: none !Important;} -.faqGroupFeatureLink a:hover{color: #000; text-decoration: underline !Important;} - -/* Partners */ - -.solutionProvider img{float: right; margin-top: 10px} -.solutionProvider .meta{margin-bottom: 15px} -.solutionProvider .meta p{font-size: 13px; margin-bottom: 0px} -.solutionProvider{border-bottom: 1px solid #efefef; padding: 10px; margin-bottom: 10px} - -.goldProvider{border: 1px solid #efefef; background: #f7f7f7;} - -/* GOLD PARTNERS */ -ul.goldPartners, ul.standardPartners{margin: 0px; padding: 0px;} -li.partner{display: block; float: left; padding: 10px; margin: 7px; width: 225px; border: 1px solid #efefef} -li.partner a, li.partner a *{text-decoration: none !Important; color: #000} -li.partner h3{color: #000; font-size: 18px; font-weight: bold; margin: 0px;} - -li.partner span.location{line-height: 15px; display: block; padding: 7px 0px 7px 0px; margin-bottom: 10px; border-bottom: #dbdbdb 1px solid; color: #666 !Important; font-size: 12px;} - -li.partner div.providerLogo{height: 160px; display: block; overflow: hidden;} -li.partner span.abstract{border: 1px solid #efefef; line-height: 17px; display: none; font-size: 12px; color: #666; padding: 10px; background: #f9f9f9; height: 138px;} - -ul.goldPartners li.partner a:hover img{display: none;} -ul.goldPartners li.partner a:hover span.abstract{display: block;} -li.partner a:hover h3{text-decoration: underline !Important;} -li.partner img{margin: auto;} - -ul.standardPartners li.partner h3{height: 18px; overflow: hidden} -ul.standardPartners li.partner{width: 135px; padding: 3px; margin: 7px;} -ul.standardPartners li.partner h3{font-size: 12px;} -ul.standardPartners li.partner div.providerLogo{height: 90px;} -ul.standardPartners li.partner span.location{line-height: 10px; font-size: 12px;} - -/*Licenses */ - -.licenseTable td{padding: 7px; border-bottom: 1px solid #efefef;} -.licenseTable{margin-bottom: 30px;} - - -/* PRODUCTS */ -div.product{padding-left: 70px; padding-bottom: 20px; background: url(/images/bg-ico2.gif) no-repeat 10px 0px; } - -/* ABOUT US */ -.class-team img {margin: 0 15px 15px 15px;} - -/* TEST YOUR NEEDS */ -#test-your-needs-container p { - margin-bottom: 2px; -} -.need-cost { - font-weight: bold; - margin-bottom: 8px; - -} - -.need-result{ - padding-left: 60px; - background: url(/images/custom/need-result-selected.png) no-repeat; -} - -.need-result-summary{ - padding-left: 60px; -} - -.needs-total { - font-weight: bold; - font-size: 130%; - padding-bottom: 10px; -} -.btn-add-to-cart { - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(/images/custom/btn-order-inline.png) no-repeat; - width:152px; - height:50px; - margin-top: 25px; -} -.btn-add-to-cart:hover { - background:url(/images/custom/btn-order-inline-hover.png) no-repeat; -} - -.btn-calculate-my-price { - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(/images/custom/btn-calculate-price.png) no-repeat; - width:152px; - height:50px; - margin-top: 25px; -} -.btn-calculate-my-price:hover { - background:url(/images/custom/btn-calculate-price-hover.png) no-repeat; -} - -.test-your-needs-questions{list-style: none; margin-left: 0; padding-left: 0;} -.test-your-needs-questions li{display: block; margin: 0; padding: 10px 0;} -.test-your-needs-questions input {margin-top: 0px; padding-top: 0px;} -.test-your-needs-questions label{padding-left: 5px; font-size: 20px;} -#test-your-needs-container h2 { -line-height: 125%; -} - - -/* 2 column pages */ -.two-column .left-column{width: 380px;} -.two-column .right-column{width: 380px;} - -.noSidebar .left-column, .noSidebar .right-column{width: 450px;} - -/* 3 column pages */ -.three-column .left-column{width: 310px; margin: 0px;} -.three-column .center-column{width: 310px; float: left; margin: 0px 15px 0px 15px;} -.three-column .right-column{width: 310px; margin: 0px;} - -/* SHOP FLOW UL */ -ul.shop-flow{display: block; list-style: none; height: 50px; padding: 0px; margin: 0px; margin-left: -10px;} -ul.shop-flow li{ display: block; padding: 0px; margin: 0px; border-bottom: 3px solid #000; float: left; height: 40px; margin-right: 2px;} -ul.shop-flow li span{display: block; padding: 20px;} -ul.shop-flow li.active{border-color: #ff6e00;} -ul.shop-flow li.done{border-color: #7a7a7a;} - -/* SHOP FLOW BUTTONS */ -#umbracoFormNavigation a{ - display: block; - width: 93px; - height: 22px; - padding-top: 6px; - font-size: 14px; - text-decoration: none; - color: white; - background: url(/images/custom/btn_sqr_blank.png) no-repeat top left; - text-align: center; -} - -/* Shop flow Checkout */ -.checkOut #couponCode{display: none;} - - -/*BREADCRUMB */ -ul.breadcrumb{z-index: 99; position: relative; list-style: none; margin: 0; padding: 0; margin-bottom: 20px;} -ul.breadcrumb li{color: #999 !Important; list-style: none; margin: 0; padding: 0; display: inline;} - -ul.breadcrumb li a{color: #999 !Important;} - - -/* BIRD */ -#bird{z-index: 999; position: relative; background: no-repeat url(/images/custom/bird0.gif) bottom left; height: 100px; width: 100px;} - - -/* EXTRA HEADER BUTTONS */ -a.support{ - width:108px; - height:108px; - text-indent:-9999px; - overflow:hidden; - float:right; - background:url(../images/btn-support.png) no-repeat; -} - -a.support:hover{background:url(../images/btn-support-hover.png) no-repeat;} - - -/* VIDEO PAGE*/ -div.videoChapter, div.videoChapter *{text-decoration: none !Important; color: #000 !Important;} -.video-list a{text-decoration: none !Important; color: #000 !Important; font-weight: normal; font-size: 10px} - -/* New list of videos... */ -.video-list2{list-style: none; display: block; padding: 0px; marging: 0px;} -.video-list2 li{width: 140px; overflow: hidden; display: block; float: left; margin: 7px; height: 145px; background: #252525;} -.video-list2 li .image{overflow: hidden; display: block; height: 100px;} - -.video-list2 li a{font-size: 11px; font-weight: normal; line-height: 13px; color: #fff !Important; text-decoration: none !Important; display: block; text-align: center;} -.video-list2 li a:hover{text-decoration: underline !Important;} -.video-list2 span.text2{display: block; padding: 4px;} -.video-list2 span.image{display: block; background: #efefef} - -/*Video Tutorial Page*/ -#VideoPlayer{margin-top: 0px; border-bottom: 2px solid #000; padding-bottom: 10px; margin-bottom: 20px;} -ul#VideoRelatedVideos{height: 555px; overflow: auto; float: right; width: 220px; list-style: none; padding: 0px; margin: 0px; } -ul#VideoRelatedVideos li{display: block; border-bottom: 1px solid #efefef; padding: 10px; height: 50px;} -ul#VideoRelatedVideos li.header{padding: 0px 10px 0px 10px; height: 25px} -ul#VideoRelatedVideos li img{float: left; margin: 0px 10px 10px 0px; border: 1px solid #efefef; background: #fff} -ul#VideoRelatedVideos li h5{padding: 0px; font-weight: normal; margin: 0; font-size: 12px; line-height: 16px} -ul#VideoRelatedVideos li h3{padding: 0px; margin: 0px; line-height: 20px} -ul#VideoRelatedVideos li.playing{background: #efefef;} - -/*Featured video */ -#tutorialFeature{border-bottom: 2px solid #EFF2F2; padding: 10px; margin-bottom: 10px; color: #666;} -#tutorialFeature h2, #tutorialFeature p, #tutorialFeature li{color: #666;} -#tutorialFeature a.preview{margin: 10px; margin-right: 35px; width: 350px; height: 190px; float: left; border: 1px solid #666} -#tutorialFeature ul{padding: 0px; list-style: none;} -#tutorialFeature ul li{padding-left: 20px; display: block; } -#tutorialFeature img{margin-bottom: 20px;} - - -/*developer page */ -.ajax ul{list-style: none; padding: 0px; margin: 0px; margin-bottom: 4px} -.ajax ul li{display: block; padding: 5px; border-bottom: 1px solid #efefef; height: 50px} -.ajax ul li small{display: block; padding: 2px; color: #999} -.ajax ul li img{width: 48px; height: 48px; float: left; margin: 0px 7px 5px 0px;} - -/* Training */ -table.reservations{} -table.reservations td, table.reservations th{padding: 7px; text-align: left; border-bottom: 1px solid #efefef} -table.reservations tbody th{width: 120px;} -table.reservations tbody td{padding-right: 10px;} -table.reservations tbody input{padding: 2px; width: 200px; font-size: 16px;} - -.center{display: block; padding: 2px; text-align: center} - -.eventList{margin: 0px; padding: 0px; list-style: none;} -.eventList li{margin: 0px; padding: 3px; border-bottom: 1px solid #efefef; display: block;} -.eventList h4{padding: 0px; margin: 0} -.eventList small{ color: #666;} - -/*RELEASES*/ -.releases-list a{color: black !Important; text-decoration: none !Important;} -.releases-list .summary{ - padding: 10px; background: #efefef; margin: 7px 7px 7px 20px; display: none; -} - - -/* BLOG */ - -p.postmetadata{color: #666; margin-bottom: 30px} -.post small{color: #666; margin-top: -10px; padding-bottom: 15px; display: block;} - - -#commentform{ - padding-left: 10px; - padding-top: 10px; - padding-bottom: 10px; -} - #commentform #gravatar{ - float:right; - margin-right: 190px; - margin-top: 20px; -} -#commentform label -{ - float:none; -} -#commentform .form-input{ - margin-top: 5px; - margin-bottom: 5px; -} -#commentform .form-input textarea{ - width: 400px; -} -#commentform .error{ -padding:0 0em; -} -#commentform label.error{ -border:none; - -padding:0 0.8em; -} -#commentform label.error { -background:#FFF; -border-color:#FBC2C4; -color:#8A1F11; -} - -#commentPosted { -border:1px solid #DDDDDD; -margin-bottom:0.5em; -padding:0 0.8em; -padding:10px; -} - -#commentPosted { -background:#FFF6BF none repeat scroll 0 0; -border-color:#FFD324; -color:#514721; -} - -ol.commentlist{margin-left: 0px; padding: 0px; list-style: none;} - -ol.commentlist li{ -margin-bottom: 10px; -padding: 10px; -background: #FAFAFA; -} - - -ol.commentlist li small.commentmetadata{display: block; font-size: 10px; padding-bottom: 5px;} -ol.commentlist li small.commentmetadata a{color: #999;} -ol.commentlist li img.gravatar{float: right; margin: 0px 0xp 10px 10px; border: 1px solid #ccc; padding: 1px;} - -/* Twitter */ -#twitterUpdates{padding: 0px; margin: 0px; list-style: none} -#twitterUpdates li{display: block; padding: 5px; margin-bottom: 20px;} -#twitterUpdates li img{float: left; clear: left; margin: 0px 20px 20px 0px;} - - -/* SEARCH */ -.searchResults{list-style: none; padding: 0px; margin: 0px;} -.searchResults li{display: block; padding-left: 60px; background: url(/images/custom/search_text.gif) no-repeat 15px 7px;} - - -.searchResults li.videochapter, .searchResults li.videotutorial{background-image: url(/images/custom/search_video.gif);} -.searchResults li.umbracoblogpost{background-image: url(/images/custom/search_blog.gif);} -.searchResults li small{color: #666; display: block; font-size: 11px} -.searchResults li h3{margin-bottom: 2px;} -.searchResults li p{margin-top: 2px;} - -/* Paypal redirect */ -body.redirecting{ - margin-top: 100px; - text-align: center; -} - -body.redirecting h1{display: block !Important; font-size: 22px} -body.redirecting div{ - margin: auto; - text-align: center; - width: 600px; - padding: 30px; - - font-size: 18px; - color: #666; - background-color: #fff; - border: 5px solid #CCDDFF -} - - -/* -- 23Videos (List for 23videos - used on CG11 ticket page) -- */ -#video23List { margin:0; padding:0; } -#video23List li { display:inline-block; height:140px; list-style-type:none; margin:0 2px; overflow:hidden; position:relative; width:170px;} -#video23List li a { color:#fff; display:block; text-decoration:none; } -#video23List li img { position:absolute; z-index:10; } -#video23List li span { background:#000; background:rgba(0,0,0,0.8); bottom:0; color:#fff; font-size:11px; height:30px; /*40-5-5=30*/ line-height:12px; padding:5px; position:absolute; width:160px; /*170-5-5=160*/ z-index:11; } - -/* -- Image Cover for Convince your boss pdf -- */ -.convinceCover { -moz-box-shadow:1px 1px 5px #666; -o-box-shadow:1px 1px 5px #666; -webkit-box-shadow:1px 1px 5px #666; box-shadow:1px 1px 5px #666; float:left; margin-right:20px; } - -/* -- CodeGarden homepage panel & button text --*/ -.tabset li a span.codegarden { background:url(../images/custom/text-codegarden-panel-label.png) no-repeat 0 0; width:92px; } -.promo-box .cyan-alt .container { background:url(../images/custom/bg-container-cyan-alt.jpg) no-repeat scroll 50% 0 transparent; } -.cgPanelHeader { background:url(../images/custom/text-codegarden-panel-header.png) no-repeat; height:89px; overflow:hidden; text-indent:-9999px; width:459px;} -.cgPanelText { width:470px; } -.cgBuyTicketBtn { background:url(../images/custom/btn_get-your-ticket.png) no-repeat 0 0; cursor: pointer; float: right; height: 108px; margin:20px 0 0 15px; overflow: hidden; text-indent: -9999px; width: 108px; } -.cgBuyTicketBtn:hover { background-position:0 -108px; } - - - -/* -- Nivio Slider styles --*/ -#slider { - position:relative; - width:692px; - height:461px; - background:url(../images/nivio-slider-2.4/loading.gif) no-repeat 50% 50%; - /*margin-bottom:50px;*/ -} -#slider img { - position:absolute; - top:0px; - left:0px; - display:none; -} -#slider a { - border:0; - display:block; -} - -.nivo-controlNav { - position:absolute; - left:260px; - bottom:-42px; -} -.nivo-controlNav a { - display:block; - width:22px; - height:22px; - background:url(../images/nivio-slider-2.4/bullets.png) no-repeat; - text-indent:-9999px; - border:0; - margin-right:3px; - float:left; -} -.nivo-controlNav a.active { - background-position:0 -22px; -} - -.nivo-directionNav a { - display:block; - width:30px; - height:30px; - background:url(../images/nivio-slider-2.4/arrows.png) no-repeat; - text-indent:-9999px; - border:0; -} -a.nivo-nextNav { - background-position:-30px 0; - right:15px; -} -a.nivo-prevNav { - left:15px; -} - -.nivo-caption -{ - color:#fff; -} - -.nivo-caption p { color:#fff; } - -.nivo-caption a { - text-decoration:underline; -} - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/Deli.css b/Marketplace/Css/Deli.css deleted file mode 100644 index c195b183..00000000 --- a/Marketplace/Css/Deli.css +++ /dev/null @@ -1,1190 +0,0 @@ -/* profile primary navigation */ - -.options ul, -.projectOptions ul, -.stepNavigation -{ - height:30px!important; - display:block; - border-bottom: 1px solid #82B84F; - margin:1em 0 0 0; - padding:0; -} - -.projectOptions -{ - position:absolute; - top:0; - left:0; - height:30px; - -} - -.projectOptions ul -{ - border-bottom:none!important; - -} - -.options ul li, -.projectOptions ul li, -.stepNavigation li -{ - float:left; - list-style:none; - padding:5px !important; - margin-bottom:-1px; - z-index:100; - height:20px; - margin:0!important; - -webkit-border-top-left-radius: 3px; - -webkit-border-top-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-topleft: 3px; - border-top-right-radius: 3px; - border-top-left-radius: 3px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.5s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.5s ease-in; - -moz-transition: background 0.5s ease-in; -} - - - -.options ul li:hover, -.projectOptions ul li:hover, -.stepNavigation li:hover -{ - background:#efefef; -} - -.projectOptions ul li:hover -{ - background:#FFF6BF; -} - -.options ul li.current, -.projectOptions ul li.current, -.stepNavigation li.current -{ - border-top: 1px solid #82B84F; - border-left: 1px solid #82B84F; - border-right: 1px solid #82B84F; - background: #d3f39c; - font-weight:bold; -} - -.projectOptions ul li.current -{ - border:none; - background:#efefef; -} - -.projectOptions ul li.current a{ - text-decoration:none!important; - color:#333!important; - font-weight:normal!important; -} - -.options ul li.current:hover -{ - background: #d3f39c; -} - -.projectOptions ul li.current:hover{ - background:#efefef; -} - -.options a, -.projectOptions a, -.stepNavigation a -{ - font-size:13px !important; -} - -#projectDescription .options a -{ - font-size:11px !important; -} - -.options li.current a, -.stepNavigation li.current a -{ - text-decoration:none; - color:#252525; -} - -/* profile & package creation sub navigation */ -.stepNavigation -{ - border-bottom: 1px solid #FFD324; -} - -.stepNavigation li.current -{ - border-top: 1px solid #FFD324; - border-left: 1px solid #FFD324; - border-right: 1px solid #FFD324; - background:#FFF6BF; -} - -.stepNavigation li.current:hover -{ - background:#FFF6BF; -} - -#tabs -{ - position:relative; - padding-top:43px; -} - -.tabContent -{ - padding:0px 1em 5px 1em; - border: 1px solid #efefef; - background:#F6F7F7; - overflow:hidden; - /*-webkit-border-bottom-left-radius: 5px; - -webkit-border-top-right-radius: 5px; - -webkit-border-bottom-right-radius: 5px; - -moz-border-radius-topright: 5px; - -moz-border-radius-bottomleft: 5px; - -moz-border-radius-bottomright: 5px; - border-top-right-radius: 5px; - border-bottom-left-radius: 5px; - border-bottom-right-radius: 5px;*/ - - -} - -/* Cart Progress Indicator */ - -.cartProgress -{ - clear:both; - overflow:hidden; - margin-bottom:10px; -} - -.cartProgress ul -{ - margin:0; - padding:0; -} - -.cartProgress ul li -{ - list-style:none; - display:block; - height:20px; - line-height:20px; - padding:5px 0px 5px 0px; - width:195px; - color:#ccc; - float:left; - margin: 0; - text-align:center; - font-size:14px; - -} - -.cartProgress ul li.complete -{ - color:#666; - background:#d3f39c; - font-weight:bold; -} - -.cartProgress ul li.current -{ - color:#fff; - font-weight:bold; - background:#8ECA56; - background:#8ECA56 url(img/progress_indicator.png) no-repeat top left; - -webkit-border-top-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -moz-border-radius-bottomright: 3px; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} - -.cartProgress ul li.first -{ - background-image:none; - -webkit-border-top-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-topleft: 3px; - -moz-border-radius-bottomleft: 3px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} - - - - - - - -/* profile projects styles */ -.profileProjectsHolder -{ - width:650px; - float:left; -} - -.profileProjects -{ - margin:0; - padding:0; - clear:both; - overflow:hidden; -} - -.profileProjects>li -{ - list-style:none; - float:left; - display:block; - width:220px; - height:90px; - border:1px solid #ccc; - background:#eee; - padding:10px 10px 10px 80px; - margin:0 1em 1em 0; - position:relative; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; -} - -.profileProjects>li.add -{ - background:#e6ffc6; - border:1px solid #8ECA56; -} - - -.profileProjects img -{ - position:absolute; - left:15px; - top:10px; -} - -.profileProjects>li.add img -{ - top:20px; - left:55px; -} - -.profileProjects>li:hover -{ - background:#ddd; -} - -.profileProjects>li.add:hover -{ - background:#baf581; -} - -.profileProjects>li h3 -{ - margin:0; - padding:0; -} - -.profileProjects>li.add h3 -{ - margin-top:27px; - margin-left:35px; -} - -.profileProjects .projectNav -{ - margin:.5em 0 0 0; - padding:0; -} - -.profileProjects .projectNav li -{ - margin:0; - padding:0; - float:left; - list-style:none; -} - -.profileProjects .projectNav li a -{ - display:block; - padding:.3em .5em; - background:#999; - text-decoration:none; - font-size:.9em; - font-weight:bold; - color:#fff; - margin:.1em; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.1s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.1s ease-in; - -moz-transition: background 0.1s ease-in; -} - -.profileProjects .projectNav li a:hover -{ - background:#8ECA56; -} - -.profileProjects .projectIcon -{ - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - - -/* Deli BI styles */ - -.overviewCharts .biChart -{ - float:left; - width:215px; - height:225px; - padding:10px; - margin:10px 10px 10px 0; - border:1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - - -.overviewCharts .biChart.last -{ - margin-right:0; -} - - - -.overviewCharts .biChart h3, .statsBoxLine h3 -{ - margin:0; - padding:0; -} - - -.statsBoxLine -{ - float:left; - width:485px; - height:220px; - padding:10px; - margin:10px 10px 10px 0; - border:1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -fieldset p{ -clear:both; -} - -.dataTable -{ - border-collapse:collapse; - border:1px solid #ddd; - width:100%; - margin-bottom:1em; -} - -.dataTable td, .dataTable th -{ - padding:8px !important; -} - - -.dataTable th -{ - color: #fff; - background: #8ECA56; - font-size:14px; -} - -.dataTable tbody tr -{ - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; -} - -.dataTable tbody tr:hover -{ - /*text-shadow: 0 0 3px #fff;*/ - background:#ddd; -} - -.dataTable tbody tr.totals:hover td -{ - - background:#82B84F; -} - -.dataTable tr.totals -{ - font-weight:bold; - font-size:14px; -} - -.dataTable tr.totals td -{ - border-top:3px solid #8ECA56; -} - -.dataTable .count, .dataTable .center -{ - text-align:center; -} - -.dataTable .money, .dataTable .right -{ - text-align:right; -} - -.statsOverview -{ - overflow:hidden; -} - -.statsBox -{ - width:200px; - height:90px; - float:left; - margin:10px 10px 10px 0; - border:1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} - -.statsBox .holder50 -{ - overflow:hidden; -} - -.statsBox .stat, .statsBox .stat50 -{ - text-align:center; - padding:10px; - background:#eee; -} - -.statsBox .stat span -{ - font-size:25px; - font-weight:bold; -} - -.statsBox .stat50 span -{ - font-size:20px; - font-weight:bold; -} - -.stat50 -{ - - width:80px; - float:left; - padding-bottom:5px!important; - padding-top:5px!important; -} - -.statsBox.green .stat -{ - background:#D3F39C; -} - -.statsBox.red .stat -{ - background:#ffbebe; -} - -.statsBox .statType -{ - font-size:15px; - font-weight:bold; - text-align:center; - padding:10px; - color:#fff; - background:#999; - border-top:1px solid #fff; -} - -.statsBox.green .statType -{ - background:#8ECA56; -} - -.statsBox.red .statType -{ - background:#bc3a3a; -} - -.statsBox.tall -{ - height:141px; -} - -/* package creation go live check styles */ - - -.eligibilityNotification, .errorBox -{ - padding:.5em 1em 0 1em; - font-weight:bold; -} - -.eligible -{ - border:4px solid #8ECA56; - background:#ddffbe; -} - -.notEligible, .errorBox -{ - border:4px solid #bc3a3a; - background:#ffbebe; -} - - -/* addtocart styles */ - -.projectPurchase, .projectDownload -{ - display:block; - margin-bottom:10px; - padding:10px 10px 10px 50px!important; - text-decoration:none; - position:relative; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - color:#999999; - font-size:80%; - text-decoration:none !important; -} - -.downloadBtn img{ -border:0; -} - - -.projectPurchase -{ - background:url("img/shoppingbasket.png") no-repeat 10px 10px #CCE2F8; -} - -.projectDownload -{ - background:#DDF8CC!important; -} - -.projectDownload .downloadBtn -{ - display:block; - position:absolute; - left:7px; - bottom:3px; - border:0; -} - - -.projectPurchase h4, .projectDownload h4 -{ - margin:0; - padding:0; -} - -.projectPurchase ul -{ - margin:0; - padding:0; -} - -.projectPurchase li -{ - font-size:11px; - display:block; - list-style:none; - margin:0; - padding:3px; - line-height:18px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - color:#999; -} - -.projectPurchase li:hover -{ - background-color:#eee; -} - -.projectPurchase li .addToCart -{ - float:right; - width:30px; - height:18px; - border:0; -} - -.microCart -{ - color:#fff; - margin-left:10px; - display:inline-block; - background:#8ECA56; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - padding:3px 3px 3px 0px; - - -} - -.microCart a -{ - text-decoration:none; -} - -#top #memberHeaderProfile -{ - top:0!important; - right:0!important; -} - -.deliLeft -{ - float:left; - width:220px; -} - -.deliRight -{ - float:left; - width:760px; -} - -.deliNav -{ - width:190px; - padding:10px; - background:#efefef; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-right:10px; - margin-bottom:10px; -} - -.deliNav.paid, .deliNav.hqPicks -{ - background:#CCE2F8; -} - -.deliHelp -{ - background:#FFF6BF; -} - - -.deliNav h3 -{ - padding:0 0 5px 0; - margin:0; - border-bottom:1px solid #ddd; -} - -.deliNav ul, -ul.linkList -{ - margin:5px 0; - padding:0; -} - -.deliNav li, - ul.linkList li -{ - list-style:none; - padding:3px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; - font-size:13px; - font-weight:bold; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - position:relative; -} - - ul.linkList.icons li - { - padding-left:40px; - } - - ul.linkList.icons li img - { - position:absolute; - left:3px; - top:3px; - } - -.deliNav li:hover, -ul.linkList li:hover, -.deliNav li.current, -ul.linkList li.current -{ - background:#fff; -} - -.deliNotification ul.linkList li:hover -{ - background:#FFD324; -} - -.deliNotification ul.linkList small -{ - font-weight:normal; -} - -.deliNav li a, -ul.linkList li a -{ - text-decoration:none!important; -} - -.deliFeatureBox -{ - border: 1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - padding:10px; - margin-top: 0px; - position:relative; -} - -.deliFeatureBox -{ - padding:0; -} - -.deliFeatureBox img -{ - display:block; - border:0; -} - -.deliFeatureBox:hover .deliPackage -{ - display:block; - position:absolute; - left:10px; - top:10px; - width:300px; - height:230px; - background:#fff; - z-index:200; - - - border:1px solid #fff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); - -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); - -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); -} - -.deliPromoBox{ - position:relative; -} - - -.deliPromoBox h2 -{ - margin-top: 8px; - margin-bottom: 10px; - padding-bottom: 3px; - - border-bottom: 1px solid #efefef; -} - -.deliPromoBox a.viewAll -{ - position:absolute; - right:10px; - top:2px; - font-size:13px; -} - -.deliPromoBox ul -{ - margin:0; - padding:0; -} - -.deliPromoBox li -{ - list-style:none; - float:left; - background:#fff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - width:164px; - height:110px; - margin:10px; - text-align:center; - position:relative; -} - -.deliPromoBox li .deliPackage -{ - padding:5px; -} - -.deliPromoBox li .deliPackage a -{ - color: #000; - text-decoration: none; -} - -.deliPromoBox li .deliPackage a:hover -{ - text-decoration: underline; -} - - - -.commercialIndicator -{ - position:absolute; - top:0; - right:0; - width:30px; - height:30px; - text-indent:-9999em; - font-size:1px; -} - -.commercialIndicator.commercial -{ - background:url(img/paid-euro.png) no-repeat top right; -} - - - -.deliPromoBox li .hiLite, -.deliFeatureBox .deliPackage -{ - display:none; -} - -.packageIcon -{ - margin:0 auto; - display:block; - width:50px; - height:1px; - padding: 0; - overflow: hidden; - padding-top: 50px; -} - -.deliPromoBox li h3 -{ - font-size:12px; - margin:0; - padding:0; -} - -.deliPromoBox li .creator, -.deliFeatureBox .deliPackage .creator -{ - font-size:9px; - display: none; -} - -.deliPromoBox li .category -{ - font-size:9px; -} - -.deliPromoBox li .popularity -{ - display: none; -} - - -.deliPromoBox li:hover .deliPackage -{ - position:absolute; - top:-25px; - left:-65px; - width:300px; - height:200px; - background:#fff; - border:1px solid #fff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - z-index:200; - text-align:left; - padding:0; - box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); - -moz-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); - -webkit-box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.60); -} - -.deliPromoBox li:hover .deliPackage .brief, -.deliFeatureBox .deliPackage .brief -{ - padding:5px 10px 10px 85px; - position:relative; - height:50px; -} - - -.deliPromoBox li:hover .deliPackage .brief .packageIcon, -.deliFeatureBox .deliPackage .brief .packageIcon -{ - position:absolute; - left:10px; - top:5px; -} - - -.deliPromoBox li:hover .deliPackage h3, -.deliFeatureBox .deliPackage h3 -{ - font-size:14px; - margin-top:12px; -} - -.deliPromoBox li:hover .deliPackage .creator, -.deliFeatureBox .deliPackage .creator -{ - position:absolute; - bottom:5px; - right:5px; -} - -.deliPromoBox li:hover .hiLite, -.deliFeatureBox .deliPackage .hiLite -{ - display:block; - padding:5px 10px 10px 85px; -} - -.deliPromoBox li:hover .hiLite p, -.deliFeatureBox .deliPackage .hiLite p -{ - font-size:12px!important; - margin:0; - padding:0; - line-height:15px; - color: #444444 -} - -.deliPromoBox li:hover .hiLite a, -.deliFeatureBox .deliPackage .hiLite a -{ - text-decoration:none!important; -} - -.deliPromoBox li:hover .popularity, -.deliFeatureBox .deliPackage .popularity -{ - display:block; - position: absolute; - top: 70px; - left: 10px; - width: 50px; - text-align: center; - font-size: 14px; - font-weight: bold; - color: #5c5c5c -} - -.deliPromoBox li:hover .popularity .karma, -.deliFeatureBox .deliPackage .popularity .karma{ - padding-bottom: 7px; - border-bottom: 1px solid #ccc; - margin-bottom: 7px; - -} - -.deliPromoBox li:hover .popularity small, -.deliFeatureBox .deliPackage .popularity small -{font-size: 10px; - font-weight: normal; display: block; text-variant: uppercase} - -.deliTags #tagCloud -{ - margin:0; - padding:0; -} - -.deliTags #tagCloud a -{ - text-decoration:none; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; - padding:3px 5px; - margin:0; -} - -.deliTags #tagCloud a:hover -{ - background:#8ECA56; - color:#fff; -} - - - .deliNotification - { - padding:10px 20px 10px 20px; - background:#FFF6BF; - border:1px solid #FFD324; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-bottom:10px; - } - - .sidebarNotification - { - margin-top:44px; - width:288px; - float:left; - } - - .deliNotification h3 - { - margin:0; - padding:0; - } - - -.deliPaging -{ - clear:both; -} - -.deliPaging li -{ - width:auto!important; - height:auto!important; -} - -.deliPaging li a -{ - display:block; - background:#eee; - color:#000; - padding:5px; - text-decoration:none; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-transition-property: background; - -webkit-transition-duration: 0.3s; - -webkit-transition-timing-function: ease-in; - -o-transition: background 0.3s ease-in; - -moz-transition: background 0.3s ease-in; -} - -.deliPaging li a:hover -{ - background:#8ECA56; - color:#fff; -} - -.deliPaging li a.selected -{ - background:#8ECA56; - color:#fff; -} - - -.clearfix:after { - content: "."; - display: block; - clear: both; - visibility: hidden; - line-height: 0; - height: 0; -} - - - -.clearfix { - display: inline-block; -} - -html[xmlns] .clearfix { - display: block; -} - -* html .clearfix { - height: 1%; -} - - - - - - - - - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/DeliAdmin.css b/Marketplace/Css/DeliAdmin.css deleted file mode 100644 index 1a43b924..00000000 --- a/Marketplace/Css/DeliAdmin.css +++ /dev/null @@ -1,39 +0,0 @@ -.dataTable -{ - width:100% !important; - table-layout: auto; - border-collapse: collapse; - border:#ccc 1px solid; -} -/*Header and Pager styles*/ -.dataTable thead tr -{ - background-image: url(../images/HeaderWhiteChrome.jpg); - background-position:center; - background-repeat:repeat-x; - background-color:#fff; - border-bottom:solid 1px #ccc; -} -.dataTable th -{ - padding: 5px; - color: #333; - text-align:left; -} - - -/*RowStyles*/ -.dataTable td -{ - padding: 5px; - border-right: solid 1px #ccc; -} - -.dataTable .borderTop -{ - border-bottom: solid 1px #ccc; -} - -.dataTable .right{ - text-align:right; -} \ No newline at end of file diff --git a/Marketplace/Css/community.css b/Marketplace/Css/community.css deleted file mode 100644 index 6258bbc0..00000000 --- a/Marketplace/Css/community.css +++ /dev/null @@ -1,761 +0,0 @@ -/*OVERALL LAYOUT*/ -html, body{padding: 0px; margin: 0px; border: none; height: 100%;} -body{font-size: 12px; background: #f5f5f5 url(img/body_bg.gif) repeat-y top center; -font-family: Trebuchet MS,Arial,sans-serif; color: #2d2c2e; padding-bottom: 0px;} - -body#tinymce{background-image: none !Important; text-align: left !Important; padding: 10px !Important;} - -#main{text-align: center; - min-height: 100%; height: auto !Important; height: 100%; -} - -.wrapper, #contentArea{margin: auto; text-align: center; width: 980px; position: relative} -.divider{padding: 5px; border-bottom: 1px #999 dotted; clear: both; margin-bottom: 10px;} - -#body, .subpage{text-align: left; } -body a{color: #2244BB } - -/*TOP + TOPNavi */ -#top{ -background: url(img/top_bg_green2.gif) repeat-x top #8ECA56; -position:relative; margin-bottom: 0px; height: 83px;} - -#top #memberInfo{background: #82b84f; height: 20px; padding: 5px;} - -#top a#logo{display: block; top: 9px; left: 0px; padding: 36px 161px 0px 0px; width: 1px; height: 1px; overflow: hidden; -background: url(img/top_logo.png) no-repeat left top; position: absolute; -} - -#top ul{float: right; list-style: none; margin: 12px 0 0 18px; padding: 0px; height: 29px; display: block;} -#top ul li{display: block; float: left; padding: 0; padding-left: 5px; height: 29px;} - -#top ul li a{ -color:#FFFFFF; display:block; -font-size:1.2em; font-variant:normal; font-weight:bold; -padding: 7px; text-decoration: none; height: 27px} - - -#top ul li a:hover{text-decoration: underline;} -#top ul li.current a{background: url(img/top_nav_a_bg.png) no-repeat bottom center;} - -#top #memberHeaderProfile{position: absolute; top: 5px; right: 7px; font-size: 11px; color: #fff; text-align: right; width: 700px;} -#top #memberHeaderProfile a{color: #fff; margin-left: 5px;} -#top #memberHeaderProfile div{display: inline !Important;} - - -#searchBar{background: #f4f4f2; border-bottom: 1px solid #dadad9; position: relative; padding: 0px; font-weight: bold; padding: 5px;} -#searchBar input.field{clear: both; margin: 0px; font-size: 1.3em; border: 1px solid #ccc; background: #fff; width: 260px} -#searchBar #bt_search{position: absolute; right: 0px; margin: 0px; font-size: 1.3em;} - -#searchBar .ui{text-align: left; width: 350px; position: relative; margin: auto;} - -#searchBarOptions{display: none; padding-top: 10px;} -#searchBarOptions label{padding-right: 15px; padding-left 5px;} - -/* Box Elemenet */ -.box { -background:#F6F7F7; -border:1px solid #F2F2F2; -display:block; -list-style-image:none; -list-style-position:outside; -list-style-type:none; -margin:0 0 20px; -padding:0 0 6px;} - -.box h4{color:#444444; font-size:12px; font-weight:bold; line-height:12px; padding: 10px !Important; background: #F0F2F2; - margin-top: 0px; margin-bottom: 0px; position: relative; -} - -.rounded{ - -webkit-border-radius: 10px; /* Safari prototype */ - -moz-border-radius: 10px; /* Gecko browsers */ - border-radius: 10px; /* Everything else - limited support at the moment */ -} - -.infoBox{padding: 7px 7px 7px 50px; height: auto !Important; min-height: 35px; height: 35px; background: #DDF8CC no-repeat 10px 7px; font-size: 11px;} -#forumTools{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/info.png); } -#projectsInfo{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } -#newTopic{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } -#solutionBox{position: absolute; top: 5px; right: 0px; width: 270px; background-image: url(img/icons/add.png); } - -.infoBox ul{list-style: none; margin: 0px; padding: 0px;} -.infoBox ul li{padding: 0px 0px 3px 0px;} -.infoBox a{padding: 2px; font-size: 12px;} -.infoBox small{color: #999; display: block; padding-top: 2px;} - -div.buttons{padding: 20px; background: #F0F2F2; font-size: 18px;} - -a.button{padding: 10px 0px 10px 0px; border: 1px solid #EFEFEF; text-decoration: none;} -a.button em{border: 5px solid #fff; padding: 5px; color: #fff; background: #F5366D; } - -/*Breadcrumb*/ -#breadcrumb{margin: 0px; margin-top: -10px !Important; padding: 4px; list-style: none; font-size: 10px; color: #999; display: block; margin-bottom: 10px;} -#breadcrumb li{display: inline; padding-right: 5px; margin: 0px;} -#breadcrumb li a{color: #999; padding-right: 3px;} - - -/*Footer*/ -.push{height: 60px; clear: both;} -#footer{font-size: 10px; background: #252525; color: #fff; padding: 20px; height: 19px; text-align: center; -border-top: 1px dotted #999; margin-top: -60px; clear: both; position: relative;} - -#footer a{color: #fff !Important} - -/* FORM ELEMENTS */ -label.inputLabel {font-weight:bold; width: 10em; display: block; float: left; padding: 1.5em 1.5em 1em 0; text-align: right; } - -fieldset {padding:0em;margin:1.5em 0 0 0;border:none; border-bottom:1px solid #ccc;} -fieldset small{display: block;} -legend {font-weight:bold;font-size:1.2em;} -input.text, input.title, textarea, select {margin:0.5em 0;border:1px solid #bbb;} -input.text:focus, input.title:focus, textarea:focus, select:focus {border:1px solid #666;} -input.text, input.title, select.title {width:300px;padding:5px;} -input.title, select.title {font-size:1.5em;} - -.buttons input{font-size: 18px;} - -textarea {width:300px;height:250px;padding:5px;} -.error, .notice, .success, .focus {padding:.2em;margin-bottom:1em;border:2px solid #ddd;} -.error {background:#FBE3E4 !Important;color:#8a1f11;border-color:#FBC2C4 !Important;} -.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} -.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} - -.error * {color:#8a1f11 !Important;} -.notice * {color:#514721;} -.success * {color:#264409;} - -.focus{border: none; border-top: 1px solid; border-bottom: 1px solid; border-color: #999; background: #F0F0F0;} - -.spotlight{padding: 0px; margin-bottom: 20px; border: none; background: none;} -.spotlight h3, .spotlight h4, .spotlight h2{position: relative; font-size: 14px; margin-bottom: 0px; margin-top: 0px; color: #333; border-bottom: 3px solid #efefef; padding-bottom: 4px;} -.spotlight h2{font-size: 18px;} - -.spotlight ul{list-style: none; margin: 0px; padding-left: 10px;} -.spotlight ul.pager{padding-left: 0px;} -.spotlight li{padding: 3px;} -.spotlight a{font-size: 12px;} - -.spotlight ul.summary{padding: 5px 0px;} -.spotlight ul.summary li{padding-bottom: 12px !Important; border: none !Important} -.spotlight a.rss_small{top: 3px;} - -dt{font-style: italic;} -dd{padding-bottom: 5px;} -label.error, label.notice, label.success {background: none; border: none; padding-left: 1em;} - -input.wikiheadline{display: block; background: white; border: 1px solid #DEE4EF; color: #46484B; width: 100%;} - -/* SEARCH RESULTS */ -#search .result{padding: 10px 10px 25px 80px; background: 20px 10px no-repeat url(search/forum.gif);} - -#search .result h3{padding: 0px; font-weight: normal; margin: 0px;} -#search .result h3 a{font-size: 14px; font-weight: bold; display: block; color: #333; text-decoration: none;} -#search .result a:hover{text-decoration: underline;} - -#search .result a *{color: inherit} -#search .result p{color: #000; font-size: 12px; padding: 0px; margin: 0px;} -#search .result cite{color: #666; font-size: 11px;} -#search .result em{font-weight: bold !Important;} - -#search .wiki{background-image: url(search/wiki.gif);} -#search .project{background-image: url(search/project.gif);} -#search .forum{background-image: url(search/forum.gif);} -#search .solution{background-image: url(search/solved.gif);} - -/* Member Badge */ -div.memberBadge{background: #f0f0f0; padding: 10px 0px 10px 0px; text-align: center;} -div.memberBadge *{color: #333;} -div.memberBadge img{display: block; margin: auto; border: 1px solid #999;} -div.memberBadge span{padding-top: 8px; display: block; font-weight: bold; font-size: 12px} -div.memberBadge small{display: block; font-weight: normal; margin-top: -6px; color: #999} - -/* FRONTPAGE */ -#dashboard{width: 980px; position: relative} -#sidebar{text-align: left; width: 300px; float: right; margin:20px 0px 20px 0px;} - -.callToAction h1{font-size: 20px;} -.callToAction p{font-size: 12px;} -.callToAction h1 a{color: #066808; text-decoration: none;} - -ul.summary{list-style: none; padding: 7px; margin: 0px; } -ul.summary li{display: block; border-bottom: #e7e7e7 1px dotted; padding: 3px;} -ul.summary li a{display: block; font-size: 11px;} -ul.summary li small a{display: inline;} - -ul.summary img{float: left; height: 32px; width: 32px; margin-right: 10px; overflow: hidden; font-size: 1px;} -ul.forumTopics li{height: auto !Important; height: 37px; min-height: 37px;} - -ul.wiki li{padding-left: 42px; background: url(img/doc.png) no-repeat left top;} -ul.projects li{padding-left: 42px; background: url(img/package.png) no-repeat left top;} - -a.rss_small{font-size: 9px; position: absolute; right: 10px; top: 8px; font-weight: normal; display: block; -padding: 14px 14px 0px 0px; overflow: hidden; height: 0px; width: 0px; background: url(img/rss.png) no-repeat top left; -} - -a.more{display: block; font-size: 11px; color: #999; text-align: center} - -/* PROJECTS */ -a.projectDownload{background: #ddf8cc url(img/down.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} -a.projectDownload span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} - -a.projectPurchase{background: #cce2f8 url(img/piggybank.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} -a.projectPurchase span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} - -.openForCollab{background: #cce2f8 url(img/group.png) no-repeat 5px 10px; padding: 10px 10px 10px 50px; display: block; margin-bottom: 10px; text-decoration: none;} -.openForCollab span{color: #999; text-decoration: none !Important; display: block; font-size: 80%;} - - -.projectGroups{margin: 0; padding: 0; list-style: none;} -.projectGroups li{margin: 0; float: left;} -.projectGroups li div{width: 380px; margin: 15px; margin-right: 30px; background: top left no-repeat; padding-left: 50px; height: 80px} - -.projectGroups h3{padding: 0px; font-weight: normal; margin: 0px;} -.projectGroups h3 a{font-size: 14px; font-weight: bold; display: block; color: #333; text-decoration: none;} -.projectGroups a:hover{text-decoration: underline;} - -.projectGroups a *{color: inherit} -.projectGroups p{color: #000; font-size: 12px; padding: 0px; margin: 0px;} - - -/* Options */ -#body .options{text-align: right; padding: 4px; font-size: 11px; margin-top:0px; margin-bottom: 10px;} -/*#body .options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 25px;} -#body .options ul li{float: left; padding-right: 15px;} -#body .options ul li a{font-size: 11px;}*/ - - -#body .options ul li.create{float: right!important;} - - -dl.summary{padding: 7px; font-size: 11px;} - - -#divFileProgressContainer{width: 300px; margin-top: 10px;} -#divFileProgressContainer .progressContainer{border: 1px solid #ccc; padding: 3px;} -#divFileProgressContainer .progressBarStatus{font-size: 10px; color: #999; } -#divFileProgressContainer .progressBarInProgress{background: green; height: 2px; overflow: hidden;} - - - -/* Member Profile */ -#profileNavigation{background: #F0F0F0; padding: 10px; border-bottom: 1px solid #ccc} -#profileNavigation #memberInfo{height: 70px; float: right; width: 300px; background: no-repeat right top; text-align: right; padding-right: 10px;} -#profileNavigation #memberInfo h3{color: #999; font-size: 18px; margin-bottom: 0px; margin-top: 5px;} -#profileNavigation #memberInfo h4{color: #999; font-size: 13px; margin: 0px;} -#profileNavigation #memberAvatar {float: right;} -#profileNavigation #memberAvatar img {height: 50px;} -#profileNavigation ul{padding: 17px; display: block; list-style: none; margin: 0px; font-size: 13px; font-weight: bold; color: #999;} -#profileNavigation ul li{display: inline;} -#profileNavigation ul a{padding: 10px;} - -#memberProfile #avatar{float: left; margin: 20px 25px 0px 0px; width: 55px} -#memberProfile #details{float: left; width: 800px;} -#memberProfile .badge{margin: auto; margin-top: 10px;} - -.yourProjects -{ - list-style-type:none; - margin-left:0; -} - -.yourProjects .projectImage -{ - float:left; - margin-right: 10px; -} - -.yourProjects .projectActions -{ - float:left; -} -.yourProjects h2 -{ - font-weight: normal; -} -.yourProjects p a -{ - color: #999999; -} - -/* Buddy Icon Form */ -#buddyIconForm {padding: 10px; display: block;} -#buddyIconForm .iconOption{width: 320px; display: block; text-align: center; float: left; font-size: 18px; font-weight: bold; color: #999;} -#buddyIconForm .iconOption img{display: block; margin: auto; border: none;} - -#webcamHolder{width: 320px; float: right; margin: 0px 0px 20px 20px;} - -/* VOTING */ -.voting{text-align: center; background: #FFF6BF; border: 2px solid #FFD324; padding: 10px 0px 10px 0px;} -.voting span{font-size: 25px; font-weight: bold; -color: #514721; display: block; text-align: center; margin-bottom: 7px;} -.voting span a{color: #514721; text-decoration: none; border-bottom: 1px dotted #999} - -.voting a.vote, .voting a.noVote{border: 1px solid #eacf5c; background: #fff; color: #514721; padding: 2px; font-size: 9px; text-decoration: none;} -.voting a.noVote{border: 1px solid #eacf5c; background: #FFF6BF; color: #eacf5c;} - - -.voting span.good a{color: green;} -.voting span.bad a{color: red;} - -.voting a img{border: none;} -.voting .like, .voting .dislike, .voting .kill{font-size: 11px; color: #066808;} - -.voting .TopicSolver{border: 1px solid #066808; padding: 2px; display: block; margin-top: 3px } - -#moveList{ z-index: 99999; text-align: right; display: none; margin: 7px 0px 0px 20px; padding: 7px; border: 1px solid #ccc; background: #fff; position: absolute; width: 250px;} -#moveList li{text-align: left !Important; padding: 0px; list-style: none; display: block !Important; float: none !Important;} -#moveList li a{padding: 3px; display: block !Important; float: none;} - -.voting .kill, .voting #ToggleMoveList{background: #fff !Important; color: #680708; border: 1px solid #680708; padding: 3px; display: block; font-size: 11px; margin-top: 10px;} -#ToggleMoveList{border-color: #ccc !Important; color: blue !Important;} - - - - -/* Pager */ -.pager{margin: 0px; padding: 10px 0px 0px 0px; list-style: none;} -.pager li{display: block; padding-right: 2px; margin: 0px; margin-bottom: 9px;float:left;} -.pager li a{font-size: 11px; padding: 3px 6px; border: 1px solid #ccc; text-decoration: none;} -.pager li.current a{border: none;} -.pager li a:hover{color: white; background: #2244BB;} -.pager li.current a{font-weight: bold;} - -#memberLoader span, #memberLoader_weeks span, #memberLoader_year span{display: block; background: url(img/ajax-loadercircle.gif) no-repeat center left; - font-size: 11px; color: #999; margin: 10px; padding: 5px 30px 10px 40px; width: 200px;} - -/* Member Locator */ - - -#memlocresults{ - margin-top: 10px; -} -#memlocradius{ - width: 470px; - -} -#memlocslider{ - float:right; - margin-top: 10px; -} - -/* SIMPLE MODAL */ -#simplemodal-container{background:#FFF6BF; color:#514721; width: 520px; border: 4px solid #FFD324; padding: 20px;} -#simplemodal-container h3, #simplemodal-container p{color:#514721; margin: 0px; padding: 0px;} -#simplemodal-container h3{font-size: 20px} -#simplemodal-container textarea{display: block; padding: 5px; width: 510px; height: 50px;} -#modalCloseButton{position: absolute; top: 10px; right: 10px; color: #514721; font-size: 11px;} - -/* Voting history */ -ul.votingHistory{display: block; padding: 5px; margin: 0px; margin-bottom: 10px; list-style: none; overflow: auto; height: 400px;} -ul.votingHistory li{display: block; padding: 10px 10px 10px 35px; margin: 0px; border-top: 1px dotted #ccc; font-size: 11px; background: 5px 12px no-repeat;} - -ul.votingHistory li.up{background-image: url(img/icons/thumb_up.png); color: #118B00} -ul.votingHistory li.down{background-image: url(img/icons/thumb_down.png); color: #8B0006} - - -/* NOTIFICATION BANNER */ -#notification{text-align: center; background:#FFF6BF; color:#514721; font-size: 14px; font-weight: bold; -border-bottom: 1px solid #FFD324; padding: 10px; - -} - -/*Project Tagger*/ -.tagger { float:left; } -.tagAdd { margin:0 0 0 6px;} -.tagList { list-style:none; padding:0; margin:0; clear:both; border-left:3px solid #ddd; padding-left:4px; float:left; margin:5px 10px;} -.tagName { cursor:pointer; float:left; clear:both; padding:0.1em 1.5em 0.1em 0.4em;} -.tagName:hover { background:#efefef url(img/bullet_toggle_minus.png) right 2px no-repeat; } - - - -/* TAGGER AUTOCOMPLETE */ -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url('img/indicator.gif') right center no-repeat; -} - -.ac_odd { - background-color: #eee; -} - -.ac_over { - background-color: #0A246A; - color: white; -} - -/*TAGCLOUD*/ -#tagCloud -{ - margin-top: 10px; - padding:10px; - margin-bottom:10px; - text-align:justify; -} - -#tagCloud A -{ - text-decoration:none; - margin-left:5px; - margin-right:5px; - font-family:Verdana, Arial; - text-transform:lowercase; - color: #8a8a8a; -} - -#tagCloud A:hover, #tagCloud a.current -{ - color:#000; - text-decoration:underline; -} - -#tagCloud A.weight1 -{ - font-size: 2em; - font-weight:bolder; -} -#tagCloud A.weight2 -{ - font-size:1.7em; - font-weight:bolder; -} -#tagCloud A.weight3 -{ - font-size: 1.4em; - font-weight:bolder; -} -#tagCloud A.weight4 -{ - - font-size: 1.1em; -} -#tagCloud A.weight5 -{ - font-size: 0.8em; -} - -#tagCloud span -{ - font-size: 10px !Important; - color: #595a5a!Important; - font-weight: normal !Important; -} - -.spotlight ul.projectsTagged li{border-bottom:1px solid #EFEFEF !important;} -ul.projectsTagged li h5 a, .projectsTagged h5{text-decoration: none; font-weight: bold; font-size: 14px; margin-bottom: 0px; margin-top: 10px; color: #000;} -ul.projectsTagged li h5 a:hover{text-decoration: underline;} - - -.projectsTagged p{#search .result p{color: #000; font-size: 12px; padding: 0px; margin: 0px;}} - -.hLabel{ - font-size: 10px; - color: #adc251; -} - -/* Project Page */ -#project{position: relative;} -#projectOwner{float: left; width: 55px; text-align: center; margin: 10px 20px 0px 0px;} -#projectDescription{float: left;} - -#projectvoting{position: absolute; top: 10px; right: 0px;} -#project .options{border-top: #efefef 1px solid; font-size: 11px; padding: 2px 0px 25px 0px; margin-right: 80px } -#project .badge{margin: auto; margin-top: 10px;} - -/* Project Screenshots */ -.projectscreenshot{ - display:block; - float:left; - padding:10px; - background-color: #F6F7F7; - margin-right: 5px; - margin-bottom: 5px; -} -.projectscreenshot:hover{ - background-color: #F0F2F2; -} - -a.badge{display: block; background: no-repeat center center; width: 40px; height: 40px; text-decoration: none; border: none; overflow: hidden; text-indent: -9999px;} -a.mvp{background-image: url(badges/mvp.png);} -a.core{background-image: url(badges/core.png);} -a.hq{background-image: url(badges/hq.png);} -a.vendor{background-image: url(badges/vendor.png);} -a.admin{background-image: url(badges/admin.png);} -a.mvpcandidate {background-image: url(badges/mvp_nominee.png);} - -/* Options */ -#options{display: block; height: 20px; padding: 5px; border-top: #efefef 1px solid; margin: 10px 0 0px 0;} -#options ul{list-style: none; margin: 0px; padding: 0px; display: block; height: 20px;} -#options ul li{float: left; padding-right: 15px; margin: 0px;} -#options ul li a{font-size: 11px; margin: 0px;} -#options ul li.right{float: right} - -/* Alert */ -.alert{ -background:#FFF6BF; -color:#514721; -font-size: 14px; -border: 1px solid #FFD324; -padding: 5px; -margin-bottom:5px; -} - -.confirm{ -background:#8ECA56; - -font-size: 14px; -border: 1px solid #6AAE30; -padding: 5px; -margin-bottom:5px; -} -/* Top Notifications */ -#topNotificationContainer -{ - display:none; -} -.topNotification -{ - background-color: #FFF6BF; - padding: 7px 0px; - border-bottom:1px solid #FFD324; - color: #735005; - font-weight:bold; -} -.notifyClose -{ - display:block; - float:right; - cursor:pointer; - border: 2px solid #FFD324; - background-color: #FFF6BF; - color: #735005; - padding: 0px 4px; - margin-right: 20px; - font-family: Arial; - text-align:center; - font-weight: 700; - line-height: 1; -} - -.notifyClose a -{ - color: ##514721; -} - -/* General */ - -a.remove -{ - color:#680708; -} - - -/* Project mark verified */ -.verifyWikiFile -{ - cursor:pointer; - color:green; - margin-top: 5px; - padding-left:18px; - background: url('img/verify.png') no-repeat bottom left; - font-size:100% !Important; -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/fonts.css b/Marketplace/Css/fonts.css deleted file mode 100644 index 2083872c..00000000 --- a/Marketplace/Css/fonts.css +++ /dev/null @@ -1,109 +0,0 @@ -/*FONTS */ - -body{font-family: Arial, Helvetica, sans-serif; font-size: 13px;} - -h1, h2, h3, h4, h5, p{font-family: Arial, Helvetica, sans-serif; color: #333;} -a{color: #1A6AB3;} - -p{font-size: 13px; margin-top: 7px; margin-bottom: 15px; color: #333; line-height: 18px} -small{font-size: 11px; color: #5b5b5b;} - -em{color: #332e2e; font-style: normal; font-weight: bold;} -h1{font-size: 28px; font-weight: bold; margin-bottom: 7px;} -h2{font-size: 18px; font-weight: bold; margin-top: 0px; margin-bottom: 3px;} -h3{font-size: 14px; font-weight: bold;} -h4{font-size: 12px; font-weight: bold; } -h5{font-size: 11px; font-weight: bold; } - -code, pre { -background-color:#F2F2F2; -border:1px solid #E3E3E3; -border-left: 4px solid #e3e3e3; -display:block !Important; -font-family:monospace; -font-size:12px; -line-height:1.4em; -margin:0 6em 1em 1em; -padding: 0.5em; -max-width: 650px; -overflow: auto; -} - -code pre{padding: 0px; border: none} - - -a.act{padding: 2px; padding-left: 20px; color: #252525; background: no-repeat center left;} - - -a.topics{background-image: url(img/ico/balloons.png);} -a.yourtopics{background-image: url(img/ico/balloon-smiley.png);} - -a.edit{background-image: url(img/ico/pencil-small.png);} -a.delete{background-image: url(img/ico/cross-small.png);} -a.move{background-image: url(img/ico/document-tree.png);} - -a.subscribe{background-image: url(img/ico/mail--plus.png);} -a.UnSubscribeTopic, a.UnSubscribeForum{background-image: url(img/ico/mail--delete.png);} -a.upload{background-image: url(img/ico/document--plus.png);} -#options a.history{background-image: url(img/ico/clock-history.png);} - - -.options{padding: 3px !Important;} - -a.add{background: #8ECA56 2px 2px url(img/ico/plus-button.png) no-repeat; padding: 3px 3px 3px 25px; -border: 1px solid #618A3B; color: #fff; text-decoration: none; margin-top: 2px; - -webkit-border-radius: 3px; /* Safari prototype */ - -moz-border-radius: 3px; /* Gecko browsers */ - border-radius: 3px; /* Everything else - limited support at the moment */ -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/repository.css b/Marketplace/Css/repository.css deleted file mode 100644 index eba2b64b..00000000 --- a/Marketplace/Css/repository.css +++ /dev/null @@ -1,181 +0,0 @@ -/* GENERAL STYLES */ -body,html{padding: 10px !Important; margin: 0px !Important; padding: 10px; background: white; background-image: none !Important;} -#closeHandle{display: none !Important;} - -#header{font-size: 14px; font-weight: bold; color: rgb(153, 153, 153); margin-bottom: 7px;} - -#header img{display: none !Important;} -img.gradient{display: none !Important;} -#theForm{margin-top: -15px; width: 100%; position: relative;} -#Table1{width: auto !Important; width: 100%; display: block; margin: 0px;} - -#profileInfo{font-size: 10px; position: absolute; right: 10px; top: 10px; color: #999;} -.propertyPane{padding: 10px; background-repeat: repeat-x} - -a{color: black;} - -body { - margin: 2px -} - -#body{margin-top: 50px;} - -.repoBox{display: block; clear: both; padding: 10px; border-bottom: 1px solid #ccc; margin-bottom: 15px;} -.noborder{border: none !Important;} -h4{margin-top: 0px; margin-bottom: 15px; font-size: 15px;} -.gradient{background-repeat: no-repeat;} - -#header{position: absolute; top: 10px; right: 15px;} -#profile{text-align: right; font-size: 10px;} -#profile input{width: 200px; margin-left: 15px;} - - -.deliLeft{ - - width: 200px; /*Width of left column*/ - position: absolute; -} - -.deliRight -{ - float: none !Important; - margin-left: 230px !Important; - width: auto !Important; -} -a.viewAll{top: 14px !Important;} - - - -.deliNav{background: none !Important; padding-left: 0;} -.deliNav a:hover{text-decoration: underline !Important;} - - -/* Project page */ - - - -/*MOVE STUFF */ -#breadcrumb{position: absolute; top: 20px; left: 10px; margin: 0px; margin-top: -10px !Important; padding: 4px; list-style: none; font-size: 11px; color: #333; display: block; margin-bottom: 10px;} -#breadcrumb li{display: inline; padding-right: 5px; margin: 0px;} -#breadcrumb li a{color: #999; padding-right: 3px;} - -/*HIDE STUFF*/ -h1{display: none !Important;} -.options{display: none !Important;} -.deliFeatureBox{display: none !Important;} -#projectOwner{display: none !Important;} - - -/*TAGCLOUD*/ -#tagCloud -{ - margin-top: 10px; - padding:10px; - margin-bottom:10px; - text-align:justify; -} - -#tagCloud A -{ - text-decoration:none; - margin-left:5px; - margin-right:5px; - font-family:Verdana, Arial; - text-transform:lowercase; - color: #8a8a8a; -} - -#tagCloud A:hover, #tagCloud a.current -{ - color:#000; - text-decoration:underline; -} - -#tagCloud A.weight1 -{ - font-size: 2em; - font-weight:bolder; -} -#tagCloud A.weight2 -{ - font-size:1.7em; - font-weight:bolder; -} -#tagCloud A.weight3 -{ - font-size: 1.4em; - font-weight:bolder; -} -#tagCloud A.weight4 -{ - - font-size: 1.1em; -} -#tagCloud A.weight5 -{ - font-size: 0.8em; -} - -#tagCloud span -{ - font-size: 10px !Important; - color: #595a5a!Important; - font-weight: normal !Important; -} - - -/* CLEAR FIX */ -clearfix:after { - content: "."; - display: block; - clear: both; - visibility: hidden; - line-height: 0; - height: 0; -} -.clearfix { - display: inline-block; -} -html[xmlns] .clearfix { - display: block; -} -* html .clearfix { - height: 1%; -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Css/screen.css b/Marketplace/Css/screen.css deleted file mode 100644 index f518255f..00000000 --- a/Marketplace/Css/screen.css +++ /dev/null @@ -1,1742 +0,0 @@ -* {font-size: 100.01%;} -html {font-size: 62.5%;} -body{ - color:#1d1d1d; - font:1.3em Calibri, Arial, Helvetica, sans-serif; - margin:0; - background:#fff; - min-width:999px; -} - - -a{ - text-decoration:none; - color:#252525; -} -a:hover{text-decoration:underline;} -a.ShopButton{display: block; width: 100px; heigth: 100px; background: red;} - -img{border-style:none;} -form,fieldset{ - margin:0; - padding:0; - border-style:none; -} -input,textarea,select{ - font:100% Calibri, Arial, Helvetica, sans-serif; - vertical-align:middle; -} -#wrapper{ - width:100%; - position:relative; - padding:439px 0 0; -} - -#wrapper.Class-Frontpage{padding:489px 0 0;} - -.none{display:none;} -/* header */ -#header{ - position:absolute; - top:0; - left:0; - height:469px; - width:100%; -} -/* form-box */ -.form-box{ - width:100%; - background:#171717 url(../images/bg-form-box.gif) repeat-x; -} -.form-box .holder{ - margin:0 auto; - width:940px; - overflow:hidden; - padding:6px 10px 8px; - position: relative; -} -/* search */ -.search { - float:right; - width:220px; -} -.search span{ - float:left; - background: url(../images/bg-search.gif) no-repeat; - width:178px; - height:17px; - padding:3px 10px 0; - font-size:12px; -} -.search span input{ - display:block; - background:none; - border:none; - outline:none; - margin:0; - padding:0; - width:100%; - color:#fff; -} -.search .submit{float:right;} -/* add-nav */ -.add-nav{ - float:right; - margin:0; - padding:3px 7px 0 0; - list-style:none; - font-size:12px; - line-height:14px; - letter-spacing:-1px; -} -.add-nav li{ - float:left; - padding:0 16px 0 0; -} -.add-nav li a{color:#fff;} -/* promo-box */ -.promo-box{ - width:100%; - position:relative; -} -/* container */ -.promo-box .container{ - height:380px; - width:100%; - overflow:hidden; -} -.promo-box .holder{ - margin:0 auto; - width:940px; - padding:98px 10px 0; -} -.promo-box .holder:after{ - display:block; - clear:both; - content:""; -} - -.promo-box .tab{width: 100%} - - -.promo-box .blackBlue .holder, -.promo-box .blackPurple .holder{ - width:943px; - padding-left:7px; -} - -.promo-box .yellow .holder{padding-top:70px;} - - -.promo-box .blue, -.promo-box .green, -.promo-box .tabPanel{ - background:url(../images/bg-tab-content2.gif) repeat-x; -} -/* tab-content4 */ -.promo-box .yellow{ - background:url(../images/bg-tab-content4.gif) repeat-x; -} -/* tab-content5 */ -.promo-box .cyan{ - background:url(../images/bg-tab-content4.gif) repeat-x; -} - -.promo-box .cyan-alt{ - background:url(../images/bg-tab-content4.gif) repeat-x; -} - -.promo-box .bg-get-started, .promo-box .bg-natural-born { - background:url(../images/bg-tab-content4.gif) repeat-x; -} - -/* tab-content1 */ -.promo-box .blackPurple{background:#252525 url(../images/bg-tab-content1.gif) repeat-x;} - -/* tab-content6 */ -.promo-box .blackBlue{ - background:url(../images/bg-tab-content6.gif) repeat-x; -} - -.promo-box .tabPanel .container{background:url(../images/bg-container2.gif) no-repeat 50% 0;} -.promo-box .bg-support .container{background:url(../images/bg-support.jpg) no-repeat 50% 0;} -.promo-box .bg-get-started .container{background:url(../images/bg-start.jpg) no-repeat 50% 0;} -.promo-box .bg-natural-born .container{background:url(../images/bg-natural-niels.jpg) no-repeat 50% 0;} - -/* Shop Flow Tab */ -.promo-box .shopFlow{background: url(../images/bg-tab-content-none.gif) repeat-x !Important;} -.promo-box .shopFlow .container{background:url(../images/bg-tab-container-none.gif) no-repeat 50% 0; height: 180px !Important;} -.promo-box .shopFlow .holder{padding:98px 0px 0 !Important;} - -/* Empty Tab */ -.promo-box .empty{background: url(../images/bg-tab-content-none.gif) repeat-x !Important;} -.promo-box .empty .container{background:url(../images/bg-tab-container-none.gif) no-repeat 50% 0; height: 120px !Important;} - -/* Map tab */ -.partnerMap{width: 100%;} -.partnerMap .holder{padding: 0px; padding-left: 0px !Important; padding-top:70px !Important; width: 100% !Important; margin-left: 0px;} -.partnerMap .container{background:url(../images/bg-container4.gif) no-repeat 50% 0;} - -.promo-box .blackPurple .container{background:url(../images/bg-container1.gif) no-repeat 50% 0;} -.promo-box .green .container{background:url(../images/bg-container2.gif) no-repeat 50% 0;} -.promo-box .blue .container{background:url(../images/bg-container3.gif) no-repeat 50% 0;} -.promo-box .yellow .container{background:url(../images/bg-container4.gif) no-repeat 50% 0;} -.promo-box .cyan .container{background:url(../images/bg-container5.jpg) no-repeat 50% 0;} -.promo-box .blackBlue .container{background:url(../images/bg-container6.gif) no-repeat 50% 0;} - -/* panel */ -.panel{ - position:absolute; - top:0; - left:0; - width:100%; -} -.panel-holder{ - margin:0 auto; - width:940px; - overflow:hidden; -} -/* logo */ -.logo{ - float:left; - width:168px; - height:51px; - overflow:hidden; - text-indent:-9999px; - background:url(../images/logo.png) no-repeat; - margin:10px 0 0; -} -.logo a{ - height:100%; - display:block; -} -/* nav */ -#nav{ - float:right; - margin:0; - padding:0; - list-style:none; -} -#nav li{ - float:left; - background:url(../images/bg-nav.png) no-repeat; - padding:12px 0 0 16px; - margin:0 15px 0 0; - height:58px; - display:inline; -} -#nav li:first-child{background:none;} -#nav li a{ - float:left; - text-indent:-9999px; - overflow:hidden; - height:34px; - cursor:pointer; - outline:none; -} -#nav li a.get-started{ - background:url(../images/text-get-started.png) no-repeat; - width:81px; -} -#nav li.active a.get-started, -#nav li a.get-started:hover{background:url(../images/text-get-started-hover.png) no-repeat;} - -#nav li a.products{ - background:url(../images/text-products.png) no-repeat; - width:66px; -} -#nav li.active a.products, -#nav li a.products:hover{background:url(../images/text-products-hover.png) no-repeat;} - -#nav li a.certified-partners{ - background:url(../images/text-partners.png) no-repeat; - width:66px;} -#nav li.active a.certified-partners, -#nav li a.certified-partners:hover{background:url(../images/text-partners-hover.png) no-repeat;} - - -#nav li a.help-and-support{ - background:url(../images/text-support.png) no-repeat; - width:106px; -} -#nav li.active a.help-and-support, -#nav li a.help-and-support:hover{background:url(../images/text-support-hover.png) no-repeat;} - -#nav li a.developers-site{ - background:url(../images/text-site.png) no-repeat; - width:111px; -} -#nav li.active a.developers-site, -#nav li a.developers-site:hover{background:url(../images/text-site-hover.png) no-repeat;} - -#nav li a.about-us{ - background:url(../images/text-about-us.png) no-repeat; - width:62px; -} -#nav li.active a.about-us, -#nav li a.about-us:hover{background:url(../images/text-about-us-hover.png) no-repeat;} -/* video-holder */ -.video-holder{ - float:left; - background:url(../images/bg-video-holder.png) no-repeat; - width:465px; - height:265px; - padding:2px 0 0 3px; -} -.video-holder a{position:relative;} -.video-holder img{display:block;} -.tab-content6 .text-holder, -.tab-content1 .text-holder{ - overflow:hidden; - height:1%; - padding:3px 0 0 15px; -} -.cms{ - display:block; - background:url(../images/text-cms.png) no-repeat; - width:364px; - height:154px; - text-indent:-9999px; - overflow:hidden; - margin:0 0 7px 2px; -} -/* section */ -.section{ - overflow:hidden; - width:372px; -} -/* list */ -.list{ - margin:0; - padding:10px 0 0; - list-style:none; - float:left; - width:200px; -} -.list li{ - background:url(../images/bg-list.gif) no-repeat 0 8px; - padding:0 0 0 5px; - margin:0 0 2px; - float:left; - width:100%; -} -.list li span{ - text-indent:-9999px; - overflow:hidden; - height:22px; - float:left; -} -.list li span.solutions{ - width:260px; - background:url(../images/text-solutions_new.png) no-repeat; -} -.list li span.free{ - width:68px; - background:url(../images/text-free.png) no-repeat; -} -.download{ - float:right; - background:url(../images/btn-download.png) no-repeat; - text-indent:-9999px; - overflow:hidden; - width:108px; - height:108px; - cursor:pointer; -} -.download:hover{background:url(../images/btn-download-hover.png) no-repeat;} -/* certificat */ -.certificat{ - position:absolute; - top:70px; - right:0; - width:180px; -} -.certificat span{ - display:block; - background:url(../images/bg-certificat.png) no-repeat; - width:180px; - height:107px; - text-indent:-9999px; - overflow:hidden; -} - - -a.our{ - float:right; - background:url(../images/btn_our.png) no-repeat; - text-indent:-9999px; - overflow:hidden; - width:108px; - height:108px; - cursor:pointer; - margin-top: -25px; -} -a.our:hover{background:url(../images/btn_our_hover.png) no-repeat;} - - -/* carousel-w */ -.carousel-w{width:100%;} -.site-running{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-site-running.png) no-repeat; - width:385px; - height:51px; -} -.as-free-as-you-need{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-as-free-as-you-need.png) no-repeat; - width:382px; - height:50px; - margin-top: 25px; -} -.text-developers-dream{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-a-developers-dream.png) no-repeat; - width:382px; - height:50px; - margin-top: 25px; -} -.prices-text { - margin-top: 15px; - width: 520px; -} -.text-well-help{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-well-help.png) no-repeat; - width:272px; - height:50px; - margin-top: 25px; -} -.support-text { - margin-top: 15px; - width: 520px; -} -.text-natural-born{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-natural-born-umbracians.png) no-repeat; - width:480px; - height:50px; - margin-top: 25px; -} -.get-started-text { - margin-top: 0px; - width: 520px; -} -.text-get-started{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-dont-worry-be-umbraco.png) no-repeat; - width:272px; - height:90px; - margin-top: 25px; - margin-bottom: 25px; -} -.about-text { - margin-top: 15px; - width: 520px; -} -.take-the-test { - float:right; - width:108px; - height:108px; - text-indent:-9999px; - overflow:hidden; - background:url(../images/btn-test-your-needs.png) no-repeat; - cursor:pointer; - margin-top: 50px; - margin-left: 10px; -} -.take-the-test:hover{background:url(../images/btn-test-your-needs-hover.png) no-repeat;} - -/* twocolumns */ -.twocolumns{ - float:right; - width:627px; - padding:37px 0 0; -} -/* switcher */ -.switcher{ - width:100%; - overflow:hidden; - border-bottom:2px solid #212627; - padding:0 0 9px; - margin:0 0 20px; -} -.switcher-inner{ - float:right; - margin:-2px 0 0; -} -.switcher ul{ - margin:0; - padding:0; - list-style:none; - float:right; -} -.switcher ul li{ - float:left; - padding-left:9px; -} -.switcher ul li a{ - float:left; - background:url(../images/bg-link.gif) no-repeat; - width:11px; - height:12px; - overflow:hidden; - text-indent:-9999px; - font-size:1px; - line-height:1px; -} -.switcher ul li a.current, -.switcher ul li a:hover{background-position:0 100%;} -/* carousel-container */ -.carousel-container{ - overflow:hidden; - height:1%; - padding:0 7px; -} -.link-prev, -.link-next{ - text-indent:-9999px; - overflow:hidden; - width:46px; - height:46px; - margin-top:62px; - outline:none; -} -.link-prev{ - float:left; - background:url(../images/bg-link-prev.gif) no-repeat; - margin-right:26px; -} -.link-next{ - float:right; - background:url(../images/bg-link-next.gif) no-repeat; -} -.link-prev:hover, -.link-next:hover{background-position:0 100%;} -.carousel-container div{ - float:left; - position:relative; - width:784px; - height:175px; - overflow:hidden; -} -.carousel-container div ul{ - margin:0; - padding:0; - list-style:none; - float:left; - width:99999px; -} -.carousel-container div ul li{ - float:left; - width:784px; - overflow:hidden; -} -.carousel-container div ul li ul{ - width:792px; - margin-right:-8px; -} -.carousel-container div ul li ul li{ - width:190px; - margin:0 8px 0 0; -} -.carousel-container div.visual{ - background:url(../images/bg-visual.png) no-repeat; - width:188px; - padding-left:1px; - float:none; -} -.carousel-container div ul li img{display:block;} -/* guidance-box */ -.guidance-box{ - float:left; - padding:14px 0 0; - width:222px; -} -.easy{ - background:url(../images/text-easy.png) no-repeat; - display:block; - text-indent:-9999px; - overflow:hidden; - width:175px; - height:90px; - padding:0 0 50px; -} -.get-books{ - float:right; - width:108px; - height:108px; - text-indent:-9999px; - overflow:hidden; - background:url(../images/btn-get-books.png) no-repeat; - cursor:pointer; -} -.get-books:hover{background:url(../images/btn-get-books-hover.png) no-repeat;} -/* twocolumns */ -.twocolumns{ - float:right; - width:627px; - padding:37px 0 0; -} -/* column */ -.column{ - float:left; - width:137px; -} -.white-paper{ - display:block; - width:120px; - height:24px; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-white-paper.png) no-repeat; -} -.twocolumns .switcher{margin-bottom:29px;} -.twocolumns .switcher-inner{ - margin:-6px 0 0; -} -.twocolumns .switcher ul{margin-top:0;} -/* long */ -.long{ - float:right; - width:460px; -} -.videos{ - display:block; - text-indent:-9999px; - overflow:hidden; - width:121px; - height:18px; - background:url(../images/text-videos.png) no-repeat; -} -.twocolumns .link-prev, -.twocolumns .link-next{margin-top:53px;} -.twocolumns .link-prev{margin-right:24px;} -.twocolumns .carousel-container div{width:308px;} -.twocolumns .carousel-container div ul li{width:308px;} -.twocolumns .carousel-container div ul li ul{ - width:320px; - margin-right:-12px; -} -.twocolumns .carousel-container div ul li ul li{ - width:148px; - margin-right:12px; -} -.carousel-container div.visual2{ - background:url(../images/bg-visual2.png) no-repeat; - width:145px; - padding:2px 0 0 3px; - float:none; -} -.visual2 .text{ - display:block; - background:#252525; - height:63px; - width:122px; - padding:6px 9px 2px; - color:#fff; - font-size:11px; - line-height:18px; - cursor:pointer; -} -.visual2 .text strong{ - display:block; - font-size:14px; -} -.carousel-container div ul li a:hover .text{color:#ff6e00;} -.price{ - float:left; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-price.png) no-repeat; - width:195px; - height:100px; - margin:84px 104px 0 0; -} -/* listing */ -.listing{ - margin:0; - padding:0; - list-style:none; - float:left; - background:url(../images/bg-listing.gif) repeat-y 171px 0; - width:400px; - height:310px; - position:relative; -} -.listing li{ - position:absolute; - float:left; -} -.listing li a{outline:none;} -.listing li.style1{ - left:0; - top:80px; -} -.listing li.style2{ - left:191px; - top:59px; -} -.listing li.style3{ - left:255px; - top:146px; -} -.listing li.style4{ - left:190px; - top:211px; -} -.listing li.style5{ - left:115px; - bottom:17px; -} -.listing li.style6{ - left:182px; - bottom:20px; -} -.listing li a img{ - float:left; - margin-right:6px; -} -.listing li.style1 a img{ - display:block; - float:none; -} -.listing li a span{ - float:left; - cursor:pointer; - text-indent:-9999px; - overflow:hidden; -} -.listing li a span.cms2{ - float:none; - display:block; - background:url(../images/text-cms2.png) no-repeat; - width:24px; - height:8px; - margin:0 0 -4px; -} -.complete{ - background:url(../images/text-complete.png) no-repeat; - width:58px; - height:15px; - margin-top:45px; -} -.channel{ - background:url(../images/text-channel.png) no-repeat; - width:80px; - height:12px; - margin-top:41px; -} -.course{ - background:url(../images/text-course.png) no-repeat; - width:42px; - height:8px; - margin-top:29px; -} -.free2{ - background:url(../images/text-free2.png) no-repeat; - width:46px; - height:15px; -} -.extras{ - background:url(../images/text-extras.png) no-repeat; - width:59px; - height:11px; -} -/* button */ -.button{ - margin: 0; - padding:0; - list-style:none; - float:right; -} -.button li{ - float:left; - margin-left:7px; - display:inline; -} -.button li a{ - display:block; - text-indent:-9999px; - overflow:hidden; - width:108px; - height:108px; -} -a.product{background:url(../images/btn-product.png) no-repeat;} -a.product:hover{background:url(../images/btn-product-hover.png) no-repeat;} -a.test{background:url(../images/btn-test.png) no-repeat;} -a.test:hover{background:url(../images/btn-test-hover.png) no-repeat;} -a.order{background:url(../images/btn-order.png) no-repeat;} -a.order:hover{background:url(../images/btn-order-hover.png) no-repeat;} -.integrator{ - background:url(../images/text-integrator.png) no-repeat; - text-indent:-9999px; - overflow:hidden; - width:354px; - height:154px; -} -.integratorText{ - width:354px; -} -.download-big{ - float:right; - background:url(../images/btn-download-big.png) no-repeat; - width:163px; - height:163px; - text-indent:-9999px; - overflow:hidden; - margin:100px 20px 0 0; - display:inline; -} -.download-big:hover{background:url(../images/btn-download-big-hover.png) no-repeat;} -/* tabs */ -.tabs{ - width:100%; - background:#060606 url(../images/bg-tabs.gif) repeat-x; -} -/* tabset */ -.tabset{ - margin:0 auto; - padding:0; - list-style:none; - width:960px; - overflow:hidden; -} -.tabset li{ - float:left; - background:url(../images/bg-tabset.gif) no-repeat; -} -.tabset li:first-child{background:none;} -.tabset li a{ - float:left; - width:139px !Important; - height:41px; - padding:14px 0 0 21px; -} -.tabset li a span{ - display:block; - text-indent:-9999px; - overflow:hidden; - height:30px; - cursor:pointer; -} -.tabset li a span.need{ - background:url(../images/text-need.png) no-repeat; - width:76px; -} -.tabset li a span.see{ - background:url(../images/text-see.png) no-repeat; - width:99px; -} -.tabset li a span.read{ - background:url(../images/text-read.png) no-repeat; - width:93px; -} -.tabset li a span.prices{ - background:url(../images/text-prices.png) no-repeat; - width:38px; -} -.tabset li a span.get-started2{ - background:url(../images/text-get-started2.png) no-repeat; - width:47px; -} -.tabset li a:hover{background:url(../images/bg-tabset-hover.gif) no-repeat 1px 0;} -.tabset li a.current{background:url(../images/bg-tabset-active.gif) no-repeat 100% 22px !important;} -/* main */ -#main{ - margin:0 auto; - width:964px; - overflow:hidden; - padding:0 4px 67px 0; - position: relative; - z-index: 20; -} -.Frontpage #main{ - padding:55px 0 56px 0; - width:960px; - min-height:356px; -} -* html .Frontpage #main { - height:356px; - overflow:visible; -} - -#main.noSidebar{ - width:960px !Important; -} - -/* Cart special rules */ -#wrapper.cart{padding-top: 250px;} -#wrapper.cart .txt-holder{width: 850px;} - -#main.noSidebar .main-holder{background: none;} -#main.noSidebar #content{float: left; width: 960px; background: none !Important;} - - - -/* block */ -.block{ - width:930px; - overflow:hidden; - padding:0 11px 0 19px; - line-height:1.3em; -} -/* extras-box */ -.extras-box{ - color:#212627; - float:left; - width:440px; - margin:0 40px 0 0; -} -/* title */ -.title{ - border-bottom:2px solid #252525; - padding:0 0 9px; - margin:0 0 16px; -} -#content .title{border-color:#000;} -.title h2{ - margin:0; - height:24px; - text-indent:-9999px; - overflow:hidden; -} -.umbraco-extras{ - background:url(../images/text-umbraco-extras.png) no-repeat; - width:159px; -} -.releases{ - background:url(../images/text-release.png) no-repeat; - width:189px; -} -.step{ - background:url(../images/text-step.png) no-repeat; - width:155px; -} -.test1{ - width:146px; - background:url(../images/text-test1.png) no-repeat; -} -/* ico-list */ -.ico-list{ - margin:0; - padding:0; - list-style:none; -} -.ico-list li{margin:0 0 13px;} -.ico-list li a{ - display:block; - width:389px; - padding:13px 0 0 51px; -} -.ico-list li a:hover{text-decoration:none;} -.ico-list li a strong{ - display:block; - text-indent:-9999px; - overflow:hidden; - height:23px; -} -.ico-list li a span{display:block;} -.ico1{background:url(../images/bg-ico1.gif) no-repeat;} -.ico1:hover{background:url(../images/bg-ico1-hover.gif) no-repeat;} -.ico2{background:url(../images/bg-ico2.gif) no-repeat;} -.ico2:hover{background:url(../images/bg-ico2-hover.gif) no-repeat;} -.ico3{background:url(../images/bg-ico3.gif) no-repeat;} -.ico3:hover{background:url(../images/bg-ico3-hover.gif) no-repeat;} -.ico-list li a strong.complete1{ - width:330px; - background:url(../images/text-complete1.png) no-repeat; -} -.ico-list li a strong.channel1{ - width:211px; - background:url(../images/text-channel1.png) no-repeat; -} -.ico-list li a strong.course1{ - width:178px; - background:url(../images/text-course1.png) no-repeat; -} -/* releases-box */ -.releases-box{ - float:left; - width:200px; - overflow:hidden; -} -/* releases-list */ -.releases-list{ - margin:0; - padding:0; - list-style:none; -} -.releases-list li{ - border-bottom:1px solid #c7c9c9; - padding:0 0 6px; - margin:0 0 6px; - height:1%; -} -.releases-list li a{ - display:block; - padding:0 0 0 18px; - background:url(../images/separator.png) no-repeat 0 20%; - color:#212627; -} -.releases-list li a strong{ - display:block; - font-size:1.07em; -} -.releases-list li a span{ - display:block; - font-size:0.85em; -} -.releases-list li a:hover{ - text-decoration:none; - background:url(../images/separator-hover.png) no-repeat 0 20%; -} -.releases-list li a:hover strong{color:#ff6e00;} -/* previouse */ -.previouse{ - background:url(../images/bg-previouse.gif) no-repeat 0 60%; - padding:0 0 0 8px; -} -/* feature-box */ -.feature-box{ - overflow:hidden; - width:100%; - padding:24px 0 0; -} -.wish{ - float:right; - text-indent:-9999px; - overflow:hidden; - width:66px; - height:66px; - background:url(../images/bg-wish.gif) no-repeat; -} -.feature-box p{margin:0;} -.feature{ - display:block; - text-indent:-9999px; - overflow:hidden; - background:url(../images/text-feature.png) no-repeat; - width:109px; - height:16px; - margin:0 0 7px; -} -/* step-box */ -.step-box{ - float:right; - width:220px; -} -.step-box .title{ - width:200px; - margin-left:10px; -} -/* accordion */ -.accordion{ - margin:-6px 0 0; - padding:0; - list-style:none; -} -* html .accordion{position:relative;} -.accordion li a{ - display:block; - width:200px; - background:#dfdfdf url(../images/bg-accordion.gif) repeat-x; - padding:0 10px; - outline:none; -} -.accordion li a strong{ - display:block; - width:100%; - background:url(../images/bg-arrow1.gif) no-repeat 100% 50%; - height:20px; - font-size:1.07em; - cursor:pointer; - padding:7px 0 3px; -} -.accordion li a:hover{ - background:#ff6f01 url(../images/bg-accordion-hover.gif) repeat-x; - text-decoration:none; -} -.accordion a:hover strong{ - background:url(../images/bg-arrow3.gif) no-repeat 100% 50%; - color:#fff; -} -.accordion a.ui-state-active{background:#dfdfdf url(../images/bg-accordion.gif) repeat-x !important;} -.accordion a.ui-state-active strong{ - background:url(../images/bg-arrow2.gif) no-repeat 100% 50% !important; - color:#252525 !important; -} -* html .slide{position:relative;} -.slide ul{ - margin:0; - padding:0 10px 5px; - list-style:none; - overflow:hidden; - width:200px; - background:#dfdfdf; -} -.slide ul li{ - float:left; - width:100%; - margin:0 0 6px; -} -.accordion .slide ul li a{ - display:block; - background:url(../images/separator.png) no-repeat 0 10%; - width:auto; - padding:1px 0 0 19px; -} -.accordion .slide ul li a:hover{background:url(../images/separator-hover.png) no-repeat 0 10%;} -/* navigation */ -.navigation{ - width:100%; - background:#252525; - margin:0 0 13px; -} -.navigation .holder{ - margin:0 auto; - width:960px; - position:relative; -} -/* main-nav */ -.main-nav{ - margin:0; - padding:0; - list-style:none; - width:100%; - overflow:hidden; - line-height:1.2em; -} -.main-nav li{ - float:left; - background:url(../images/divider.gif) no-repeat; - width:160px; -} -.main-nav li:first-child{background:none;} -.main-nav li a{ - float:left; - width:145px; - color:#fff; - padding:19px 5px 17px 10px; - min-height:69px; -} -* html .main-nav li a{height:69px;} -.main-nav li a strong{ - display:block; - text-indent:-9999px; - overflow:hidden; - height:16px; - margin:0 0 6px; -} -.main-nav li a span{display:block;} -.sign-in{ - background:url(../images/text-sign-in.png) no-repeat; - width:44px; -} -.get-inspired{ - background:url(../images/text-get-inspired.png) no-repeat; - width:80px; -} -.follow-us{ - background:url(../images/text-follow-us.png) no-repeat; - width:61px; -} -.providers{ - width:124px; - background:url(../images/text-providers.png) no-repeat; -} -.main-nav .developer-site{ - width:104px; - background:url(../images/text-site1.png) no-repeat; -} -.dev-area { - margin-left: 0px; - margin-top: 10px; -} - -.contact{ - width:53px; - background:url(../images/text-contact.png) no-repeat; -} -.get-it{ - width:41px; - background:url(../images/text-get-it.png) no-repeat; -} -.main-nav li a:hover{ - background:url(../images/bg-main-nav-hover.gif) no-repeat 1px 0; - text-decoration:none; -} -.main-nav li a.last{width:60px;} -.main-nav li a.last:hover{background:none;} -.main-nav li a.download-small{ - float:right; - background:url(../images/bg-download-small.gif) no-repeat !important; - width:60px; - min-height:61px !important; - overflow:hidden; - text-indent:-9999px; - padding:0; - margin:24px 10px 0 0; - display:inline; -} -* html .main-nav li a.download-small{height:61px !important;} -.main-nav li a.download-small:hover{background-position:0 100% !important;} -/* picture */ -.picture{ - position:absolute; - top:-100px; - left:237px; - background:url(../images/bg-picture.gif) bottom right no-repeat; - width:573px; - height:100px; -} -.main-holder{ - background:url(../images/bg-main-holder.gif) no-repeat; - width:960px; - overflow:hidden; -} -/* content */ -#content { - float:right; - width:790px; - color:#1d1d1d; - padding:25px 0 0; - line-height:1.3em; - overflow:hidden; - position:relative; - z-index:5; -} - -#content h1{ - font-size: 2em; margin: 0 0 1em 0; -} - -#content h1.umbraco-cms{ - background:url(../images/text-umbraco-cms.png) no-repeat; - width:188px; -} -#content h1.video-tutorials{ - background:url(../images/text-video-tutorials.png) no-repeat; - width:208px; -} -.content-holder{ - width:100%; - overflow:hidden; - margin:0 0 33px; -} -.tab-contents{ - width:100%; - overflow:hidden; -} -.txt-holder{ - float:left; - width:455px; -} - - -.short .txt-holder{ - width:220px; - color:#000; -} - -.txt-holder p{margin:0 0 17px;} -.txt-holder .big{ - font-size:1.2em; - line-height:1.3em; - margin:0 0 12px; -} - -.right-column{width: 300px; float: right;} - -.short .txt-holder .big{margin-bottom:19px;} -.txt-holder .big p{margin:0;} -.content-holder .alignright{ - float:right; - margin:4px 0 0; -} -.platea{ - display:block; - font-size:1.08em; - margin:0 0 7px; -} -/* item-list */ -.item-list{ - margin:-16px -20px 24px 0; - padding:0; - list-style:none; - width:800px; - overflow:hidden; - font-size:1.07em; - background:#eaeaea url(../images/bg-item-list.gif) repeat-x; -} -.item-list li{ - width:160px; - float:left; - background:url(../images/sep1.gif) no-repeat; - display:table; -} -.item-list li:first-child{background:none;} -.item-list li a{ - color:#000 !Important; - text-decoration: none !Important; - height:55px; - display:table-cell; - vertical-align:middle; - outline:none; -} -* html .item-list li a{float:left;} -*+html .item-list li a{float:left;} -.item-list li a:hover{ - text-decoration:none; - background:url(../images/bg-item-list-hover.gif) no-repeat; -} -.item-list li a span{ - display:block; - width:130px; - background:url(../images/bg-arrow4.gif) no-repeat 100% 50%; - padding:2px 20px; - position:relative; - margin:0 -10px 0 0; - cursor:pointer; -} -.item-list li a.active{background:none !important;} -.item-list li a.active span{background:url(../images/bg-arrow5.gif) no-repeat 100% 50% !important;} -/* article */ -.article{ - border-collapse:collapse; - float:right; - width:541px; - color:#fff; - margin:6px 0 0; -} -.article th{ - padding:10px 1px 10px 0; - border-bottom:1px solid #fff; - background:#333 url(../images/sep2.gif) repeat-y 100% 0; - font-size:1.15em; - line-height:1.35em; -} -.article th.style1{ - width:153px; - background:none; -} -.article th.style2{width:125px;} -.article th.style3{width:114px;} -.article th.style4{ - width:145px; - background:#333; - padding-right:0; -} -.article td{ - padding:8px 1px 9px 0; - border-bottom:1px solid #fff; - background:#6f6f6f url(../images/sep2.gif) repeat-y 100% 0; - text-align:center; - font-size:0.92em; - letter-spacing:-1px; -} -.article td.style1{ - background-color:#efefef; - color:#333; -} -.article td.style4{ - background:#6f6f6f; - padding-right:0; -} -/* sidebar */ -#sidebar{ - float:left; - width:154px; - padding:5px 0 0; -} -/* nav-bar */ -.nav-bar{ - background:url(../images/bg-nav-bar.gif) repeat-y; -} -.nav-bar ul{ - margin:0; - padding:0 0 45px 4px; - list-style:none; - background:url(../images/bg-nav-bar-ul.gif) no-repeat 0 100%; - font-size:1.08em; - line-height:1em; -} -.nav-bar ul li{ - background:url(../images/bg-nav-bar-li.gif) no-repeat; -} -.nav-bar ul li:first-child{background:none;} -.nav-bar ul li a{ - color:#252525; - display:block; - width:125px; - padding:18px 5px 18px 20px; -} -.nav-bar ul li.active a{ - background:#fff; - text-decoration:none; -} -.offernewblack{ - text-indent:-9999px; - overflow:hidden; - display:block; - background:url(../images/text-free-new-black.png) no-repeat; - width:341px; - height:50px; - padding:0 0 30px; -} -.core-channel{ - text-indent:-9999px; - overflow:hidden; - display:block; - background:url(../images/text-core-channel.png) no-repeat; - width:246px; - height:37px; - padding:0 0 30px; -} -.text1{ - display:block; - - overflow:hidden; - - width:258px; - height:75px; - margin:0 0 9px; - color:white; -} -.section2{ - width:100%; - overflow:hidden; -} -.order1{ - width:108px; - height:108px; - text-indent:-9999px; - overflow:hidden; - float:right; - background:url(../images/btn-order1.png) no-repeat; -} -.order1:hover{background:url(../images/btn-order1-hover.png) no-repeat;} -/* video-list */ -.video-list{ - margin:0 0 30px; - padding:14px 0 0 3px; - list-style:none; - width:830px; - overflow:hidden; - font-size:0.85em; -} -.offersignup{ - width:108px; - height:108px; - text-indent:-9999px; - overflow:hidden; - float:right; - background:url(../images/btn-signup.png) no-repeat; -} -.video-list li{ - display:inline-block; - vertical-align:top; - width:144px; - margin:0 15px 26px 0; -} -* html .video-list li{display:inline;} -*+html .video-list li{display:inline;} -.video-list li a{ - color:#252525; - display:block; - cursor:pointer; - outline:none; - width:144px; - overflow:hidden; -} -.video-list li a .image{ - display:block; - width:144px; - height:83px; - overflow:hidden; - margin:0 0 8px; - border-bottom: 1px solid #ccc; -} -.video-list li a:hover{ - text-decoration:none; - background:none; -} -.video-list li a .image img{vertical-align:top;} -.video-list li a:hover img{} -.video-list li a .text2{ - display:block; - background:url(../images/bg-arrow6.png) no-repeat; - padding:0 0 0 20px; - width:124px; -} -.video-list li a .text2 strong{ - display:block; - font-size:1.28em; - margin:0 0 3px; -} -.video-list li a:hover .text2{background:url(../images/bg-arrow7.png) no-repeat;} -.video-list li a:hover .text2 strong{color:#ff6e00;} -.next-step{ - text-indent:-9999px; - overflow:hidden; - display:block; - background:url(../images/text-next-step.png) no-repeat; - width:112px; - height:24px; -} -#content .switcher-inner{margin-top:-12px;} -/* carousel-container2 */ -.carousel-container2{ - overflow:hidden; - height:1%; - padding:8px 3px 0 11px; - margin:0 0 35px; - background:url(../images/bg-carousel-container2.gif) repeat-x 0 100%; -} -.carousel-container2 .link-prev, -.carousel-container2 .link-next{margin-top:52px;} -.carousel-container2 .link-prev{margin-right:24px;} -.carousel-container2 div{ - float:left; - position:relative; - width:628px; - height:180px; - overflow:hidden; -} -.carousel-container2 div ul{ - margin:0; - padding:0; - list-style:none; - float:left; - width:99999px; -} -.carousel-container2 div ul li{ - float:left; - width:628px; - overflow:hidden; -} -.carousel-container2 div ul li ul{ - margin:0 -12px 0 0; - padding:0; - list-style:none; - width:640px; -} -.carousel-container2 div ul li ul li{ - width:148px; - margin:0 12px 0 0; -} -.carousel-container2 div.visual3{ - width:145px; - height:175px; - background:url(../images/bg-visual3.png) no-repeat; - padding:2px 0 0 3px; -} -.carousel-container2 div ul li a{ - display:block; - width:140px; - height:150px; - background:#252525 url(../images/bg-visual-a.gif) no-repeat; - position:relative; - font-size:14px; - line-height:1.3em; - color:#fff; -} -.carousel-container2 div ul li a:hover{ - background:#252525 url(../images/bg-visual-a-hover.gif) no-repeat; - color:#ff6e00; - text-decoration:none; -} -.carousel-container2 div ul li a strong{ - position:absolute; - bottom:0; - left:0; - background:#252525; - width:124px; - padding:7px 6px 9px 10px; - cursor:pointer; -} -/* footer-w */ -.footer-w{ - overflow:hidden; - width:100%; - background:url(../images/bg-footer-w.gif) repeat-x 0 100%; -} -.footer{ - width:100%; - background:url(../images/bg-footer.gif) no-repeat 50% 100%; -} -.footer .holder{ - margin:0 auto; - width:940px; - overflow:hidden; - padding:0 10px 18px; - color:#2f2f2f; - line-height:1em; -} -.footer address{font-style:normal;} -.footer address strong, -.footer address span{ - margin:0 0 5px; - display:block; -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/* EDITOR PROPERTIES - PLEASE DON'T DELETE THIS LINE TO AVOID DUPLICATE PROPERTIES */ diff --git a/Marketplace/Extensions.cs b/Marketplace/Extensions.cs index a44d8958..11bd44b7 100644 --- a/Marketplace/Extensions.cs +++ b/Marketplace/Extensions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; -namespace Marketplace +namespace uProject { public static class Extensions { diff --git a/Marketplace/Helpers/ExtensionMethods.cs b/Marketplace/Helpers/ExtensionMethods.cs index 1d4c3c43..4736d8d7 100644 --- a/Marketplace/Helpers/ExtensionMethods.cs +++ b/Marketplace/Helpers/ExtensionMethods.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Web; using Marketplace.Interfaces; -namespace Marketplace.Helpers +namespace uProject.Helpers { public static class ExtensionMethods { diff --git a/Marketplace/Helpers/Helper.cs b/Marketplace/Helpers/Helper.cs index dc900fcd..e32f6442 100644 --- a/Marketplace/Helpers/Helper.cs +++ b/Marketplace/Helpers/Helper.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Web.UI; -using Marketplace.usercontrols.Deli.Package; +using uProject.usercontrols.Deli.Package; -namespace Marketplace.Helpers +namespace uProject.Helpers { public static class ProjectCreatorHelper { diff --git a/Marketplace/MasterPages/ConfigureProjectLicenses.master b/Marketplace/MasterPages/ConfigureProjectLicenses.master deleted file mode 100644 index d9c8e92f..00000000 --- a/Marketplace/MasterPages/ConfigureProjectLicenses.master +++ /dev/null @@ -1,13 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - - - - - -
- -
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/Deli.master b/Marketplace/MasterPages/Deli.master deleted file mode 100644 index 311e69d6..00000000 --- a/Marketplace/MasterPages/Deli.master +++ /dev/null @@ -1,40 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - -
- - - - -
- -
- - - -
- <%if(umbraco.library.IsLoggedOn()){ %> - Create a new project - <% } %> -
- -
-
- -
- -
-

HQ Picks

- -
-
-
- -
-
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/DeliCart.master b/Marketplace/MasterPages/DeliCart.master deleted file mode 100644 index e52f513f..00000000 --- a/Marketplace/MasterPages/DeliCart.master +++ /dev/null @@ -1,20 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - - - - -
- -
- -
- -

- - - -
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/DeliCartDetails.master b/Marketplace/MasterPages/DeliCartDetails.master deleted file mode 100644 index f4d7a7b9..00000000 --- a/Marketplace/MasterPages/DeliCartDetails.master +++ /dev/null @@ -1,19 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - - - - -
- -
- -
- - - - -
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/EditProject.master b/Marketplace/MasterPages/EditProject.master deleted file mode 100644 index e1a3c22c..00000000 --- a/Marketplace/MasterPages/EditProject.master +++ /dev/null @@ -1,25 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - - - - - - - -
-
- -
- -

-
- -
- - - - -
- \ No newline at end of file diff --git a/Marketplace/MasterPages/Master.master b/Marketplace/MasterPages/Master.master deleted file mode 100644 index 73326285..00000000 --- a/Marketplace/MasterPages/Master.master +++ /dev/null @@ -1,146 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - - - - - - - - - - - - - <umbraco:Macro Alias="Title" runat="server"></umbraco:Macro> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - -
-
- - x - - First time here? Check out the FAQ -
-
- - -
- -
-
-
- - -
-
-
- -
- - -
-
- - - - - - - - -
- - - -
-
- -
-

- - - - -
- - -
- -
- -
- -
- - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/PayPalRedirect.master b/Marketplace/MasterPages/PayPalRedirect.master deleted file mode 100644 index 6f818070..00000000 --- a/Marketplace/MasterPages/PayPalRedirect.master +++ /dev/null @@ -1,38 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> - - - - - - - - <umbraco:Item ID="Item1" field="pageName" runat="server"></umbraco:Item> - Umbraco.org - the friendly CMS - - - - - - - - - -
-

Please wait...

-

- We are redirecting you to paypal.com, where you can pay your order securely. Please do not hit the "back" or "forward" - navigation buttons on your browser. -

-

- Thank you for your patience -

- - - -
- - - - - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Project.master b/Marketplace/MasterPages/Project.master deleted file mode 100644 index 88ea25b8..00000000 --- a/Marketplace/MasterPages/Project.master +++ /dev/null @@ -1,44 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - - - - - - - - - - - - -
- -
- -
- - - - -
- -<% if( umbraco.presentation.nodeFactory.Node.GetCurrent().Children.Count > 0 ){ %> -

Package discussions

- -<% -} -%> - -
- -
- \ No newline at end of file diff --git a/Marketplace/MasterPages/ProjectGroup.master b/Marketplace/MasterPages/ProjectGroup.master deleted file mode 100644 index 33acc7da..00000000 --- a/Marketplace/MasterPages/ProjectGroup.master +++ /dev/null @@ -1,38 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - - -
- -
- -
- -

-
- <%if(umbraco.library.IsLoggedOn()){ %> - Create a new project - <% } %> -
- -
-
- -
- -
-

HQ Picks

- -
-
-
-
- -
-
-
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/Projects.master b/Marketplace/MasterPages/Projects.master deleted file mode 100644 index fa574153..00000000 --- a/Marketplace/MasterPages/Projects.master +++ /dev/null @@ -1,68 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %> - - -
- -<%-- div style="margin-top: 25px"> - -
- -

-
- <%if(umbraco.library.IsLoggedOn()){ %> - Create a new project - <% } %> -
- -
-
- -
- -
-

HQ Picks

- -
-
-

About Deli

- -
-
- -
- -
-
- -
-
-

Popular Packages

- " class="viewAll">All popular - -
-
-

New Packages

- " class="viewAll">All new - -
-
List your package here! Whether it's free or a commercial, it's easy to list in the Deli. Get started today
-
-

Browse by Tag

- -
-
- -
- - - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/ProjectsTags.master b/Marketplace/MasterPages/ProjectsTags.master deleted file mode 100644 index 7c1084dd..00000000 --- a/Marketplace/MasterPages/ProjectsTags.master +++ /dev/null @@ -1,22 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> - - - -
- -
-

Browse projects by tag

- - - -
-

Browse by tag

- -
-
-

Projects tagged with: <%= Request["tag"] %>

- -
- - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Community.master b/Marketplace/MasterPages/Repository/Community.master deleted file mode 100644 index 04ad75da..00000000 --- a/Marketplace/MasterPages/Repository/Community.master +++ /dev/null @@ -1,98 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - - -
- -
-

The friendliest CMS community on the planet

- -
-

-our.umbraco.org is the central hub for the friendly umbraco community. Search for documentation, get -help and guidance from seasoned experts, download and collaborate on plugins and extensions. -

- - <%if(!umbraco.library.IsLoggedOn()){ %> -

Register an account or Login

- <%}%> -
- -
- - -
-
-

Forum talk rss

-
Loading forum list...
-More.. -
-
- -
- -
-

New projects rss

-
Loading the newest projects...
-More.. -
- -
-

New documentation rss

-
Loading the latest documentation...
-More.. -
-
- -
- -
-

Community blogs rss

-
Loading blog list...
-
- -
-

Twitter rss

-
Loading tweets...
-
- -
- - -
- - - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Master.master b/Marketplace/MasterPages/Repository/Master.master deleted file mode 100644 index 9050413e..00000000 --- a/Marketplace/MasterPages/Repository/Master.master +++ /dev/null @@ -1,99 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/umbraco/masterpages/default.master" AutoEventWireup="true" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> - - - - - - Umbraco Package Repository - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- - - - -

- - - - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Nothing.master b/Marketplace/MasterPages/Repository/Nothing.master deleted file mode 100644 index d8e768ef..00000000 --- a/Marketplace/MasterPages/Repository/Nothing.master +++ /dev/null @@ -1,34 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="/umbraco/masterpages/default.master" AutoEventWireup="true" %> - - - - - - - - -
- -

our.umbraco.org is getting a massage

-

We are truly sorry for the inconvenience, but our.umbraco.org is getting an upgrade to fix a couple of issues -reported by our lovely community. -

- -

Update: Bug is found, patch has been applied, testing as we speak

- - -

-We will be back ASAP
-/Per Ploug Hansen -

- -






- - - -
- - - - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Project.master b/Marketplace/MasterPages/Repository/Project.master deleted file mode 100644 index e4453a80..00000000 --- a/Marketplace/MasterPages/Repository/Project.master +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - - -
- - - - -
- \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/ProjectGroup.master b/Marketplace/MasterPages/Repository/ProjectGroup.master deleted file mode 100644 index d88bfee5..00000000 --- a/Marketplace/MasterPages/Repository/ProjectGroup.master +++ /dev/null @@ -1,32 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - - -
- - - -
-
- -
- -
-

HQ Picks

- -
-
- -
-
-

- -
-
- -
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Projects.master b/Marketplace/MasterPages/Repository/Projects.master deleted file mode 100644 index 8c2d95a0..00000000 --- a/Marketplace/MasterPages/Repository/Projects.master +++ /dev/null @@ -1,47 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - -
- -
-
- -
- -
-

HQ Picks

- -
-
- -
- -
-
- -
-
-

Popular Packages

- " class="viewAll">All popular - -
-
-

New Packages

- " class="viewAll">All new - -
-
List your package here! Whether it's free or a commercial, it's easy to list in the Deli. Get started today
-
-

Browse by Tag

- -
-
- -
-
- - - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/ProjectsTags.master b/Marketplace/MasterPages/Repository/ProjectsTags.master deleted file mode 100644 index ade63286..00000000 --- a/Marketplace/MasterPages/Repository/ProjectsTags.master +++ /dev/null @@ -1,21 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - -
- -
- -
- -

Browse projects by tag

-
- Create a new project -
- -<%-- umbraco:Macro Alias="Project-tagcloud" runat="server"> - - - -
- - \ No newline at end of file diff --git a/Marketplace/MasterPages/Repository/Textpage.master b/Marketplace/MasterPages/Repository/Textpage.master deleted file mode 100644 index 31c69a09..00000000 --- a/Marketplace/MasterPages/Repository/Textpage.master +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="Master.master" AutoEventWireup="true" %> - - -
-
-

- -
-
- diff --git a/Marketplace/MasterPages/newest.master b/Marketplace/MasterPages/newest.master deleted file mode 100644 index c3c13549..00000000 --- a/Marketplace/MasterPages/newest.master +++ /dev/null @@ -1,14 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> - - -
- -
-

Newest packages

- - - -
- -
- \ No newline at end of file diff --git a/Marketplace/MasterPages/popular.master b/Marketplace/MasterPages/popular.master deleted file mode 100644 index 882c94f3..00000000 --- a/Marketplace/MasterPages/popular.master +++ /dev/null @@ -1,14 +0,0 @@ -<%@ Master Language="C#" MasterPageFile="~/masterpages/Deli.master" AutoEventWireup="true" %> - - -
- -
-

Popular packages

- - - -
- -
- \ No newline at end of file diff --git a/Marketplace/Models/ProjectContributor.cs b/Marketplace/Models/ProjectContributor.cs index c74edb25..00acea2a 100644 --- a/Marketplace/Models/ProjectContributor.cs +++ b/Marketplace/Models/ProjectContributor.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Web; using Umbraco.Core.Persistence; -namespace Marketplace.Models +namespace uProject.Models { [TableName("projectContributors")] public class ProjectContributor diff --git a/Marketplace/Models/ProjectForum.cs b/Marketplace/Models/ProjectForum.cs index dd5c87f8..26b1e445 100644 --- a/Marketplace/Models/ProjectForum.cs +++ b/Marketplace/Models/ProjectForum.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Runtime.Serialization; using System.Web; -namespace Marketplace.Models +namespace uProject.Models { [DataContract(Name = "projectForum", Namespace = "")] public class ProjectForum diff --git a/Marketplace/ProjectFileUploadHandler.cs b/Marketplace/ProjectFileUploadHandler.cs index adc98ce6..0e493bfa 100644 --- a/Marketplace/ProjectFileUploadHandler.cs +++ b/Marketplace/ProjectFileUploadHandler.cs @@ -11,7 +11,8 @@ using our; using Marketplace.Providers.MediaFile; using Marketplace.Umbraco.BusinessLogic; -namespace Marketplace { +namespace uProject +{ public class ProjectFileUploadHandler : IHttpHandler { #region IHttpHandler Members diff --git a/Marketplace/Properties/Settings.Designer.cs b/Marketplace/Properties/Settings.Designer.cs index 90f7075b..8daec752 100644 --- a/Marketplace/Properties/Settings.Designer.cs +++ b/Marketplace/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.Properties { +namespace uProject.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] diff --git a/Marketplace/Razor/Deli-MyProjects.cshtml b/Marketplace/Razor/Deli-MyProjects.cshtml deleted file mode 100644 index 53c6d1e4..00000000 --- a/Marketplace/Razor/Deli-MyProjects.cshtml +++ /dev/null @@ -1,95 +0,0 @@ -@using Marketplace.Interfaces -@using Marketplace.Providers - -@{ - IMemberProvider memberProvider = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; - IMember member = memberProvider.GetCurrentMember(); - IListingProvider provider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; - IEnumerable projects = provider.GetListingsByVendor(member.Id,true,true); - - string editUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Edit)); - string forumUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Forum)); - string licenseUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Licenses)); - string teamUrl = umbraco.library.NiceUrl(Int32.Parse(Parameter.Team)); -} - -

Your existing projects

- -
    -@foreach (var project in projects) -{ -
  • -

    - @project.Name -

    - @if (!string.IsNullOrEmpty(project.DefaultScreenshot)) - { - @project.Name - } - else - { - @project.Name - } - - @project.CreateDate.ToString("D") - -
      -
    • Edit
      • -
    • Forums
      • - @if (project.ListingType == ListingType.commercial) - { -
    • Licenses
      • - } - - @if (project.OpenForCollab) - { -
    • Team
      • - } -
    -
    • - -} -

  • -Add new project -

    -Add new project -
    • -
- - - - - -@{ - var contribProjects = provider.GetListingsForContributor(member.Id); -} - -@if (contribProjects.Count() > 0) -{ -

Project where you are contributor

- -} - diff --git a/Marketplace/Razor/Deli-ProjectCategories.cshtml b/Marketplace/Razor/Deli-ProjectCategories.cshtml deleted file mode 100644 index 56b7e806..00000000 --- a/Marketplace/Razor/Deli-ProjectCategories.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@using Marketplace.Interfaces -@using Marketplace.Providers - -@{ - ICategoryProvider categoryProvider = (ICategoryProvider)MarketplaceProviderManager.Providers["CategoryProvider"]; - IEnumerable cats = categoryProvider.GetAllCategories(); - var selected = ""; -} -

Project Categories

-
    -@foreach (var cat in cats) -{ - -
  • - - - @cat.Name - -@* (@cat.ProjectCount)*@ -
    • -} -
diff --git a/Marketplace/Razor/Deli-TagCloud.cshtml b/Marketplace/Razor/Deli-TagCloud.cshtml deleted file mode 100644 index 7b6d5623..00000000 --- a/Marketplace/Razor/Deli-TagCloud.cshtml +++ /dev/null @@ -1,33 +0,0 @@ -@using Marketplace.Interfaces -@using Marketplace.Providers - -@{ - var tagsProvider = (IProjectTagProvider)MarketplaceProviderManager.Providers["TagProvider"]; - var tags = tagsProvider.GetAllTags(false).OrderBy(x => x.Count).Take(50).OrderBy(x => x.Text); - max = tags.Max(x => x.LiveCount); -} - -@functions{ - - public int max { get; set; } - public string weight(int liveCount) - { - double perc = ((double)liveCount / (double)max) * 100; - - if(perc >= 99)return "weight1"; - if(perc >= 70)return "weight2"; - if(perc >= 40)return "weight3"; - if(perc >= 20)return "weight4"; - return "weight5"; - - - } -} - - - -
-@foreach (var t in tags) { - @t.Text -} -
diff --git a/Marketplace/Razor/VersionCompatibilityReport.cs b/Marketplace/Razor/VersionCompatibilityReport.cs deleted file mode 100644 index 1bef4284..00000000 --- a/Marketplace/Razor/VersionCompatibilityReport.cs +++ /dev/null @@ -1,92 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using Marketplace.uVersion; -using Marketplace.Interfaces; -using Marketplace.Providers; - -namespace Marketplace.Razor -{ - public class VersionCompatibilityReport - { - private List uVersions; - private int fileId { get; set; } - private int packageId { get; set; } - private IListingProvider projectProvider; - private IListingItem project; - private IMediaFile file; - - - public VersionCompatibilityReport(int fid, int pid) - { - uVersions = Marketplace.uVersion.UVersion.GetAllVersions(); - fileId = fid; - packageId = packageId; - projectProvider = (IListingProvider)MarketplaceProviderManager.Providers["ListingProvider"]; - project = projectProvider.GetListing(pid, false); - file = project.PackageFile.FirstOrDefault(x => x.Id == Int32.Parse(project.CurrentReleaseFile)); - } - - public List GetCompatibilityReport() - { - var compatList = new List(); - using (Marketplace.Data.MarketplaceDataContext ctx = new Marketplace.Data.MarketplaceDataContext()) - { - - foreach (var ver in uVersions) - { - var reports = ctx.DeliVersionCompatibilities.Where(x => x.version == ver.Name && x.projectId == project.Id); - - if (reports.Any()) - { - float compats = reports.Count(x => x.isCompatible); - float numReps = reports.Count(); - var perc = Convert.ToInt32(((compats / numReps) * 100)); - - var smiley = "unhappy"; - - if (perc >= 95) - { - smiley = "joyous"; - } - else if (perc < 95 && perc >= 80) - { - smiley = "happy"; - } - else if (perc < 80 && perc >= 65) - { - smiley = "neutral"; - } - else if (perc < 65 && perc >= 50) - { - smiley = "unhappy"; - } - else - { - smiley = "superUnhappy"; - } - - - - compatList.Add(new verCompat() { perc = perc, smiley = smiley, version = ver.Name }); - } - else - { - compatList.Add(new verCompat() { perc = 0, smiley = "untested", version = ver.Name }); - } - - } - } - return compatList; - - } - } - - public class verCompat - { - public int perc { get; set; } - public string smiley { get; set; } - public string version { get; set; } - } -} \ No newline at end of file diff --git a/Marketplace/Razor/versionCompatibility.cshtml b/Marketplace/Razor/versionCompatibility.cshtml deleted file mode 100644 index 1382a192..00000000 --- a/Marketplace/Razor/versionCompatibility.cshtml +++ /dev/null @@ -1,46 +0,0 @@ -@using Marketplace.uVersion; -@{ - var versions = UVersion.GetAllVersions(); - var fileId = @Parameter.fileId; - var packageId = @Parameter.packageId; - - var memberProvider = (Marketplace.Interfaces.IMemberProvider)Marketplace.Providers.MarketplaceProviderManager.Providers["MemberProvider"]; - var mem = memberProvider.GetCurrentMember(); - - var projectProvider = (Marketplace.Interfaces.IListingProvider)Marketplace.Providers.MarketplaceProviderManager.Providers["ListingProvider"]; - var Project = projectProvider.GetListing(Int32.Parse(packageId)); - -} - -@if(umbraco.library.IsLoggedOn()) -{ - - if(Marketplace.library.HasDownloaded(mem.Id, Project.Id)) - { - - - - @foreach (var v in versions) - { - var alias = v.Name.Replace(".", ""); - - - - - - - } -
@v.Name
- - @:or Cancel - } - else - { -

You need to download this package before you can report on it's compatibility

- } - -} -else -{ -

You must login before you can report on package compatibility.

-} \ No newline at end of file diff --git a/Marketplace/Razor/versionCompatibilityReport.cshtml b/Marketplace/Razor/versionCompatibilityReport.cshtml deleted file mode 100644 index e5ae2682..00000000 --- a/Marketplace/Razor/versionCompatibilityReport.cshtml +++ /dev/null @@ -1,26 +0,0 @@ -@using Marketplace.Razor; -@{ - int fileId = Int32.Parse(Parameter.fileId); - int packageId = Int32.Parse(Parameter.packageId); - - var verReport = new VersionCompatibilityReport(fileId, packageId); -} - -This project is compatible with the following versions as reported by community members who have downloaded this package:

- -@{ - - foreach (var ver in verReport.GetCompatibilityReport()) - { - if(ver.smiley != "untested"){ - @ver.version (@ver.perc%) - } - else - { - @ver.version (untested) - } - } -} - -
- \ No newline at end of file diff --git a/Marketplace/Services/ContributionService.cs b/Marketplace/Services/ContributionService.cs index 4a876588..9bfa16bc 100644 --- a/Marketplace/Services/ContributionService.cs +++ b/Marketplace/Services/ContributionService.cs @@ -1,4 +1,4 @@ -using Marketplace.Models; +using uProject.Models; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Web; using Umbraco.Core; using Umbraco.Core.Persistence; -namespace Marketplace.Services +namespace uProject.Services { public class ContributionService: IDisposable { diff --git a/Marketplace/Singleton.cs b/Marketplace/Singleton.cs index 3e41be69..8ef93ac1 100644 --- a/Marketplace/Singleton.cs +++ b/Marketplace/Singleton.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Marketplace +namespace uProject { public class Singleton where T : class, new() { diff --git a/Marketplace/library.cs b/Marketplace/library.cs index 5ba7ee4e..82010daf 100644 --- a/Marketplace/library.cs +++ b/Marketplace/library.cs @@ -11,7 +11,7 @@ using umbraco.NodeFactory; using System.Globalization; using Marketplace.Data; -namespace Marketplace +namespace uProject { [XsltExtension("deli.library")] public class library diff --git a/Marketplace/Marketplace.csproj b/Marketplace/uProject.csproj similarity index 89% rename from Marketplace/Marketplace.csproj rename to Marketplace/uProject.csproj index 0b5af3b5..03cbfbb4 100644 --- a/Marketplace/Marketplace.csproj +++ b/Marketplace/uProject.csproj @@ -295,7 +295,6 @@ - @@ -309,7 +308,6 @@ True Settings.settings - @@ -361,29 +359,11 @@ MyProjects.ascx - - Signup.ascx - ASPXCodeBehind - - - Signup.ascx - - - Login_novalidationscript.ascx - ASPXCodeBehind - - - Login_novalidationscript.ascx - - - - - @@ -391,23 +371,8 @@ - - - - - - - - - - - - - - - SettingsSingleFileGenerator Settings.Designer.cs @@ -416,27 +381,6 @@ Designer - - - - - - - - - - - - - - - - - - - - - diff --git a/Marketplace/uVersion/config.cs b/Marketplace/uVersion/config.cs index 1685e5f3..0084cf5e 100644 --- a/Marketplace/uVersion/config.cs +++ b/Marketplace/uVersion/config.cs @@ -7,7 +7,7 @@ using System.IO; using System.Web.Caching; using umbraco.BusinessLogic; -namespace Marketplace.uVersion +namespace uProject.uVersion { public class config { diff --git a/Marketplace/uVersion/uVersion.cs b/Marketplace/uVersion/uVersion.cs index 3fb1fc83..54db1bad 100644 --- a/Marketplace/uVersion/uVersion.cs +++ b/Marketplace/uVersion/uVersion.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Web; using System.Xml; -namespace Marketplace.uVersion +namespace uProject.uVersion { public class UVersion { diff --git a/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs b/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs index 9bf18207..be1fc8a8 100644 --- a/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Editor.ascx.cs @@ -12,7 +12,7 @@ using Marketplace.Interfaces; using umbraco.cms.businesslogic.member; using our; -namespace Marketplace.usercontrols.Deli.Package +namespace uProject.usercontrols.Deli.Package { public partial class Editor : System.Web.UI.UserControl { @@ -47,7 +47,7 @@ namespace Marketplace.usercontrols.Deli.Package var controlToLoad = new System.Web.UI.UserControl().LoadControl(IOHelper.ResolveUrl(currentStep.UserControl)); if (currentStep.Alias == "details") - ((Marketplace.usercontrols.Deli.Package.Steps.Details)controlToLoad).IsDeliVendor = _vendor.Member.IsDeliVendor; + ((uProject.usercontrols.Deli.Package.Steps.Details)controlToLoad).IsDeliVendor = _vendor.Member.IsDeliVendor; StepPlaceHolder.Controls.Add(controlToLoad); Step.Value = currentStep.Alias; diff --git a/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs index cadbd376..846b33d9 100644 --- a/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Editor.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package { +namespace uProject.usercontrols.Deli.Package { public partial class Editor { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs index db528ede..c033bbcd 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.cs @@ -7,9 +7,9 @@ using System.Web.UI.WebControls; using Marketplace.Interfaces; using Marketplace.Providers; using Marketplace.BusinessLogic; -using Marketplace.Helpers; +using uProject.Helpers; -namespace Marketplace.usercontrols.Deli.Package.Steps +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Complete : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs index c8e01c36..d36c200f 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Complete.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package.Steps { +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Complete { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs index 299d45aa..3a58d0d4 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.cs @@ -11,11 +11,11 @@ using Marketplace.Providers.ListingItem; using Marketplace.BusinessLogic.ListingCreator; using umbraco.cms.businesslogic.member; using Marketplace.BusinessLogic; -using Marketplace.Helpers; +using uProject.Helpers; using umbraco.NodeFactory; using System.Text.RegularExpressions; -namespace Marketplace.usercontrols.Deli.Package.Steps +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Details : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs index fcb3f1cf..73f219eb 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Details.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package.Steps { +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Details { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs index 743e5e91..917cede9 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.cs @@ -11,10 +11,10 @@ using our; using Marketplace.BusinessLogic; using Marketplace.Umbraco.BusinessLogic; using Marketplace.Providers.Helpers; -using Marketplace.Helpers; +using uProject.Helpers; using Marketplace.Providers.MediaFile; -namespace Marketplace.usercontrols.Deli.Package.Steps +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Files : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs index 93ac7b64..33c12deb 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Files.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package.Steps { +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Files { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs index e8acefeb..0b8f2682 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.cs @@ -10,11 +10,11 @@ using umbraco.cms.businesslogic.member; using our; using Marketplace.Providers.License; using Marketplace.Providers.Helpers; -using Marketplace.Helpers; +using uProject.Helpers; using Marketplace.Providers.Accounting; using System.Text.RegularExpressions; -namespace Marketplace.usercontrols.Deli.Package.Steps +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Licenses : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs index 41f492fe..2c38635d 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Licenses.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package.Steps { +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Licenses { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs index ace1954f..951dd9e3 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.cs @@ -10,9 +10,9 @@ using umbraco.cms.businesslogic.member; using our; using Marketplace.Umbraco.BusinessLogic; using Marketplace.Providers.Helpers; -using Marketplace.Helpers; +using uProject.Helpers; -namespace Marketplace.usercontrols.Deli.Package.Steps +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Screenshots : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs index deea0bf0..5a7cfef8 100644 --- a/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Package/Steps/Screenshots.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Package.Steps { +namespace uProject.usercontrols.Deli.Package.Steps { public partial class Screenshots { diff --git a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs index b70f313f..f95ff43b 100644 --- a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs +++ b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.cs @@ -8,7 +8,7 @@ using System.Web.UI.WebControls; using Marketplace.Interfaces; using Marketplace.Providers; -namespace Marketplace.usercontrols.Deli.Profile +namespace uProject.usercontrols.Deli.Profile { public partial class MyProjects : System.Web.UI.UserControl { diff --git a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs index 9e8e1baa..6d5749b4 100644 --- a/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs +++ b/Marketplace/usercontrols/Deli/Profile/MyProjects.ascx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace Marketplace.usercontrols.Deli.Profile { +namespace uProject.usercontrols.Deli.Profile { public partial class MyProjects { diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx b/Marketplace/usercontrols/Deli/Profile/Signup.ascx deleted file mode 100644 index 39ac09fa..00000000 --- a/Marketplace/usercontrols/Deli/Profile/Signup.ascx +++ /dev/null @@ -1,312 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Signup.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Profile.Signup" %> -<%@ Register Assembly="Marketplace" TagPrefix="Deli" Namespace="Marketplace.Controls" %> - - -
    -
  • Basic Profile
    • -
  • Vendor Profile
    • -
- - - - -
-
- Basic Information -

- We just need the most basic information from you. -

-

- Name - -

-

- Company - -

-

- Email - -

-

- Password - -

-

- Bio
No html allowed - -

-
- -
- Billing Information -

- If you are planning on buying products from the Deli, to speed up the checkout process fill in as much of the following as possible -

-

- VAT Number - -

-

- Address - -

-

- Country - -

-

- Billing Email - -

- -
- -
- Services -

- Share your ideas, topics and photos related to umbraco. -

-

- Twitter Alias - -

-

- Flickr Alias - -

-

- -

-
- -
- Newsletters and treshold -

- Treshold is a way to control what items are displayed to you. Any item with a score lower then your set treshold, will not be displayed in the forum. -

-

- Treshold - -

- -

- Email - Do not send me any notifications or newsletters from our.umbraco.org -

- -
- - -
- Where do you live? -

- Tell us where you live, you can leave out streetnames, but city, zip-code and country is mandatory. When your location is displayed correctly on the map below, - enough information has been provided. -

- -

- - - - - -

- -
- -
-
- - - -
- -
- -
- - - - - - -
-
- Vendor Information -

- This is the information for your Vendor profile that will be displayed to users. -

-

- Vendor Name - -

-

- Company Bio - -

-

- Company Url - -

-

- Support Url - -

-

- Billing email address - -

-

- Support email address - -

-

- Country - -

-
-
- Banking & Tax Details -

Please fill in as much of these details as possible to make it easier for us to pay you

-

- Your Currency - -

-

- IBAN - -

-

- SWIFT - -

-

- BSB - -

-

- Bank Account No. - -

-

- PayPal Account - -

-

- Tax Id - -

-

- VAT Number - -

-
-
- Deli Vendor Terms & Conditions -

By ticking the following box you are stating that you agree to the terms and conditions set out by Umbraco in the Deli Vendor Terms & Conditions document

-

- Do you Accept the Deli Vendor Terms & Conditions? -

-
- -
- -
-
- - - - - \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs deleted file mode 100644 index ffdf6f6a..00000000 --- a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.cs +++ /dev/null @@ -1,297 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using umbraco.cms.businesslogic.member; -using Marketplace.Interfaces; -using Marketplace.Providers; -using Marketplace.Providers.Members; -using System.Web.UI.HtmlControls; - -namespace Marketplace.usercontrols.Deli.Profile -{ - public partial class Signup : System.Web.UI.UserControl { - - public string Group { get; set; } - public string memberType { get; set; } - public int NextPage { get; set; } - - private IMemberProvider mp; - private IMember m; - - protected void Page_Init(object sender,EventArgs e){ - mp = (IMemberProvider)MarketplaceProviderManager.Providers["MemberProvider"]; - m = mp.GetCurrentMember(); - - if (m == null || !m.IsDeliVendor) - { - ProfileNavigation.Visible = false; - } - } - - - protected void Page_Load(object sender, EventArgs e) { - //lazyloading the needed javascript for validation. (addded it to the master template as our ahah forms need it aswel) - //umbraco.library.RegisterJavaScriptFile("jquery.validation", "/scripts/jquery.validation.js"); - - if(!Page.IsPostBack){ - ((HtmlGenericControl)profileNav.Parent).Attributes.Add("class","current"); - } - - - if (!Page.IsPostBack && m != null) { - tb_name.Text = m.Name; - tb_email.Text = m.Email; - - //make sure that it is not required to enter the password.. - tb_password.CssClass = "title"; - - //hack on the save button... - bt_submit.Text = "Save"; - - //treshold and newsletter - - cb_bugMeNot.Checked = m.BugMeNot; - - - tb_treshold.Text = m.Threshold.ToString(); - - //optional.. - tb_twitter.Text = m.Twitter; - tb_flickr.Text = m.Flickr; - tb_company.Text = m.Company; - tb_bio.Text = m.Profile; - - //Location - tb_lat.Value = m.Latitude; - tb_lng.Value = m.Longitude; - tb_location.Text = m.Location; - - //billing details - tb_companyAddress.Text = m.CompanyAddress; - dd_companyCountry.SelectedValue = m.CompanyCountry; - tb_companyBillingEmail.Text = m.CompanyInvoiceEmail; - tb_companyVatNumber.Text = m.CompanyVATNumber; - - if (m.IsDeliVendor) - { - var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; - var vendor = vendorProvider.GetVendorById(m.Id); - - - tb_vendorCompany.Text = vendor.VendorCompanyName; - dd_vendorCountry.SelectedValue = vendor.VendorCountry; - tb_vendorDescription.Text = vendor.VendorDescription; - - tb_vendorUrl.Text = vendor.VendorUrl; - tb_vendorSupportUrl.Text = vendor.SupportUrl; - tb_vendorBillingEmail.Text = vendor.BillingContactEmail; - tb_vendorSupportEmail.Text = vendor.SupportContactEmail; - tb_vendorIban.Text = vendor.IBAN; - tb_vendorSwift.Text = vendor.SWIFT; - tb_vendorBsb.Text = vendor.BSB; - tb_vendorAccount.Text = vendor.AccountNumber; - tb_vendorPayPal.Text = vendor.PayPalAccount; - tb_vendorBaseCurrency.Text = vendor.BaseCurrency; - tb_vendorTaxId.Text = vendor.TaxId; - tb_vendorVatNumber.Text = vendor.VATNumber; - - //check to see if the box is checked. If it is dont allow it to be rechecked - if (vendor.DeliTermsAgreementDate != DateTime.MinValue && vendor.DeliTermsAgreementDate != null) - { - cb_vendorTerms.Checked = true; - cb_vendorTerms.Enabled = false; - } - - } - - } - - } - - protected void createMember(object sender, EventArgs e) { - - //Member is already logged in, and we just need to save his new data... - if (m != null) { - m.Name = tb_name.Text; - m.Email = tb_email.Text; - - if (tb_password.Text != "") - m.Password = tb_password.Text; - - //optional.. - m.Twitter = tb_twitter.Text; - m.Flickr = tb_flickr.Text; - m.Company = tb_company.Text; - m.Profile = tb_bio.Text; - - //location - m.Location = tb_location.Text; - m.Latitude = tb_lat.Value; - m.Longitude = tb_lng.Value; - - //billing info - m.CompanyAddress = tb_companyAddress.Text; - m.CompanyCountry = dd_companyCountry.SelectedValue; - m.CompanyInvoiceEmail = tb_companyBillingEmail.Text; - m.CompanyVATNumber = tb_companyVatNumber.Text; - - var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; - if (m.CompanyCountry.ToLower() != null) - { - switch (m.CompanyCountry) - { - case "dk": - cartProvider.SetCurrency(Currency.DKK); - break; - - case "us": - case "ca": - cartProvider.SetCurrency(Currency.USD); - break; - - default: - cartProvider.SetCurrency(Currency.EUR); - break; - } - } - - - //treshold + newsletter - m.Threshold = Int32.Parse(tb_treshold.Text); - m.BugMeNot = cb_bugMeNot.Checked; - - mp.SaveOrUpdate(m); - - Response.Redirect(umbraco.library.NiceUrl(NextPage)); - - } else { - if (tb_email.Text != "") { - m = mp.GetMemberByEmail(tb_email.Text); - if (m == null) { - - m = new DeliMember(); - - m.Name = tb_name.Text; - m.Email = tb_email.Text; - m.Password = tb_password.Text; - - - //Location - m.Location = tb_location.Text; - m.Latitude = tb_lat.Value; - m.Longitude = tb_lng.Value; - - //billing info - m.CompanyAddress = tb_companyAddress.Text; - m.CompanyCountry = dd_companyCountry.SelectedValue; - m.CompanyInvoiceEmail = tb_companyBillingEmail.Text; - m.CompanyVATNumber = tb_companyVatNumber.Text; - - - var cartProvider = (ICartProvider)MarketplaceProviderManager.Providers["CartProvider"]; - if (m.CompanyCountry.ToLower() != null) - { - switch (m.CompanyCountry) - { - case "dk": - cartProvider.SetCurrency(Currency.DKK); - break; - - case "us": - case "ca": - cartProvider.SetCurrency(Currency.USD); - break; - - default: - cartProvider.SetCurrency(Currency.EUR); - break; - } - } - - //optional.. - m.Twitter = tb_twitter.Text; - m.Flickr = tb_flickr.Text; - m.Company = tb_company.Text; - m.Profile = tb_bio.Text; - - //treshold + newsletter - m.Threshold = Int32.Parse(tb_treshold.Text); - m.BugMeNot = cb_bugMeNot.Checked; - - //Standard values - m.ReputationTotal = 20; - m.ReputationCurrent = 20; - m.ForumPosts = 0; - - //add the group - m.Groups = new string[] { Group }; - - mp.SaveOrUpdate(m); - - Response.Redirect(umbraco.library.NiceUrl(NextPage)); - } - } - } - } - - protected void updateVendor(object sender, EventArgs e) - { - var vendorProvider = (IVendorProvider)MarketplaceProviderManager.Providers["VendorProvider"]; - var vendor = vendorProvider.GetVendorById(m.Id); - - vendor.VendorCompanyName = tb_vendorCompany.Text; - vendor.VendorCountry = dd_vendorCountry.SelectedValue; - vendor.VendorDescription = tb_vendorDescription.Text; - - vendor.VendorUrl = tb_vendorUrl.Text; - vendor.SupportUrl = tb_vendorSupportUrl.Text; - vendor.BillingContactEmail = tb_vendorBillingEmail.Text; - vendor.SupportContactEmail = tb_vendorSupportEmail.Text; - vendor.IBAN = tb_vendorIban.Text; - vendor.SWIFT = tb_vendorSwift.Text; - vendor.BSB = tb_vendorBsb.Text; - vendor.AccountNumber = tb_vendorAccount.Text; - vendor.PayPalAccount = tb_vendorPayPal.Text; - vendor.BaseCurrency = tb_vendorBaseCurrency.Text; - vendor.TaxId = tb_vendorTaxId.Text; - vendor.VATNumber = tb_vendorVatNumber.Text; - - if (cb_vendorTerms.Enabled && cb_vendorTerms.Checked) - { - vendor.DeliTermsAgreementDate = DateTime.Now.ToUniversalTime(); - } - - vendorProvider.SaveOrUpdate(vendor); - - Response.Redirect(umbraco.library.NiceUrl(NextPage)); - } - - protected void ChangeProfile(object sender, EventArgs e) - { - var b = sender as LinkButton; - var parentControl = b.Parent as HtmlGenericControl; - - switch (b.CommandArgument) - { - case "Basic": - - SignupBasicProfile.Visible = true; - VendorProfile.Visible = false; - parentControl.Attributes.Add("class", "current"); - ((HtmlGenericControl)vendorNav.Parent).Attributes.Add("class", ""); - break; - case "Vendor": - SignupBasicProfile.Visible = false; - VendorProfile.Visible = true; - parentControl.Attributes.Add("class", "current"); - ((HtmlGenericControl)profileNav.Parent).Attributes.Add("class", ""); - break; - default: - break; - } - } - - } -} \ No newline at end of file diff --git a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs b/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs deleted file mode 100644 index e749c3ce..00000000 --- a/Marketplace/usercontrols/Deli/Profile/Signup.ascx.designer.cs +++ /dev/null @@ -1,465 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Marketplace.usercontrols.Deli.Profile { - - - public partial class Signup { - - /// - /// ProfileNavigation control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ProfileNavigation; - - /// - /// profileNav control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton profileNav; - - /// - /// vendorNav control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton vendorNav; - - /// - /// SignupBasicProfile control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder SignupBasicProfile; - - /// - /// Label1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label1; - - /// - /// tb_name control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_name; - - /// - /// Label2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label2; - - /// - /// tb_company control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_company; - - /// - /// Label3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label3; - - /// - /// tb_email control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_email; - - /// - /// Label4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label4; - - /// - /// tb_password control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password; - - /// - /// Label10 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label10; - - /// - /// tb_bio control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_bio; - - /// - /// tb_companyVatNumber control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_companyVatNumber; - - /// - /// tb_companyAddress control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_companyAddress; - - /// - /// dd_companyCountry control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Marketplace.Controls.CountryDropDownList dd_companyCountry; - - /// - /// tb_companyBillingEmail control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_companyBillingEmail; - - /// - /// Label5 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label5; - - /// - /// tb_twitter control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_twitter; - - /// - /// Label6 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label6; - - /// - /// tb_flickr control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_flickr; - - /// - /// tb_emailConfirm control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_emailConfirm; - - /// - /// Label7 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label7; - - /// - /// tb_treshold control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_treshold; - - /// - /// Label9 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label9; - - /// - /// cb_bugMeNot control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox cb_bugMeNot; - - /// - /// Label8 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label8; - - /// - /// tb_location control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_location; - - /// - /// tb_lat control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HiddenField tb_lat; - - /// - /// tb_lng control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HiddenField tb_lng; - - /// - /// bt_submit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_submit; - - /// - /// VendorProfile control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder VendorProfile; - - /// - /// tb_vendorCompany control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorCompany; - - /// - /// tb_vendorDescription control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorDescription; - - /// - /// tb_vendorUrl control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorUrl; - - /// - /// tb_vendorSupportUrl control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorSupportUrl; - - /// - /// tb_vendorBillingEmail control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorBillingEmail; - - /// - /// tb_vendorSupportEmail control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorSupportEmail; - - /// - /// dd_vendorCountry control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Marketplace.Controls.CountryDropDownList dd_vendorCountry; - - /// - /// tb_vendorBaseCurrency control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorBaseCurrency; - - /// - /// tb_vendorIban control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorIban; - - /// - /// tb_vendorSwift control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorSwift; - - /// - /// tb_vendorBsb control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorBsb; - - /// - /// tb_vendorAccount control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorAccount; - - /// - /// tb_vendorPayPal control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorPayPal; - - /// - /// tb_vendorTaxId control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorTaxId; - - /// - /// tb_vendorVatNumber control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_vendorVatNumber; - - /// - /// cb_vendorTerms control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox cb_vendorTerms; - - /// - /// bt_vendorSubmit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_vendorSubmit; - } -} diff --git a/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx b/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx deleted file mode 100644 index 2dcad174..00000000 --- a/Marketplace/usercontrols/our.umbraco.org/HeaderLogin.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HeaderLogin.ascx.cs" Inherits="our.usercontrols.HeaderLogin" %> - - - You are logged in as %name% - You are not logged in - - - Your profile - Log out - Log in - Create a profile - \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx deleted file mode 100644 index b976e92c..00000000 --- a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx +++ /dev/null @@ -1,20 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="Login_novalidationscript.ascx.cs" Inherits="Marketplace.usercontrols.ourUmbraco.Login_novalidationscript" %> - -
-
- -
- Email - -
- -
- Password - -
-
- -
-
-
- \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs deleted file mode 100644 index 2d69ed36..00000000 --- a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Marketplace.usercontrols.ourUmbraco -{ - public partial class Login_novalidationscript : System.Web.UI.UserControl - { - public int NextPage { get; set; } - public string ErrorMessage { get; set; } - - protected void Page_Load(object sender, EventArgs e) - { - umbraco.library.RegisterJavaScriptFile("jquery.validation", "/scripts/jquery.validation.js"); - } - - protected void login(object sender, EventArgs e) - { - string email = tb_email.Text; - string password = tb_password.Text; - string redirectUrl = Request.QueryString["redirectUrl"]; - - umbraco.cms.businesslogic.member.Member m = umbraco.cms.businesslogic.member.Member.GetMemberFromLoginNameAndPassword(email, password); - - if (m != null) - { - umbraco.cms.businesslogic.member.Member.AddMemberToCache(m); - - if (!string.IsNullOrEmpty(redirectUrl)) - Response.Redirect(redirectUrl); - - if (NextPage > 0) - Response.Redirect(umbraco.library.NiceUrl(NextPage) + "?loggedin=true"); - - } - else - { - lt_err.Text = "

" + ErrorMessage + "

"; - lt_err.Visible = true; - } - } - } -} \ No newline at end of file diff --git a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs b/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs deleted file mode 100644 index df1f141f..00000000 --- a/Marketplace/usercontrols/our.umbraco.org/Login_novalidationscript.ascx.designer.cs +++ /dev/null @@ -1,78 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Marketplace.usercontrols.ourUmbraco { - - - public partial class Login_novalidationscript { - - /// - /// Panel1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel Panel1; - - /// - /// lt_err control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal lt_err; - - /// - /// Label2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label2; - - /// - /// tb_email control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_email; - - /// - /// Label3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label Label3; - - /// - /// tb_password control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password; - - /// - /// bt_login control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button bt_login; - } -} diff --git a/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx b/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx deleted file mode 100644 index b1360ea0..00000000 --- a/Marketplace/usercontrols/umbracoMemberControls/umbLogin.ascx +++ /dev/null @@ -1,27 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="false" Codebehind="umbLogin.ascx.cs" Inherits="umbracoMemberControls.umbGroupSignInOut" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> - - - - - - - - - - - - - - -
- -
Password -
-
- - - - - Sign Out - - diff --git a/OurUmbraco.Site/App_Data/packages/created/createdPackages.config b/OurUmbraco.Site/App_Data/packages/created/createdPackages.config index 445cfd32..f7e74b70 100644 --- a/OurUmbraco.Site/App_Data/packages/created/createdPackages.config +++ b/OurUmbraco.Site/App_Data/packages/created/createdPackages.config @@ -262,4 +262,56 @@ + + MIT License + stub + + + + + + + + + + + + + + 1154 + + + + + + + + + + + MIT License + stub + + + + + + + + + + + + + + 1155 + + + + + + + + + \ No newline at end of file diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index e41286de..1a9b1a30 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -4650,9 +4650,9 @@ - + {6a2b659e-8bae-4cd5-8764-851dfbe95fbf} - Marketplace + uProject {6cf53d68-bd81-47bb-8f56-350a1b04f114} diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml index 811a376d..425ba7f6 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/ProfileProjectTeam.cshtml @@ -12,9 +12,9 @@ var openForCollab = project.GetPropertyValue("openForCollab"); - var contris = new List(); + var contris = new List(); - using (var cs = new Marketplace.Services.ContributionService()) + using (var cs = new uProject.Services.ContributionService()) { contris = cs.GetContributions(id).ToList(); } diff --git a/our.umbraco.org.sln b/our.umbraco.org.sln index 8eae49b2..3c3aed36 100644 --- a/our.umbraco.org.sln +++ b/our.umbraco.org.sln @@ -38,7 +38,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F3A30E EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uRelease", "uRelease\uRelease.csproj", "{C5B74E6A-ABCE-4A9A-896D-89C33FDAFCD8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marketplace", "Marketplace\Marketplace.csproj", "{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uProject", "Marketplace\uProject.csproj", "{6A2B659E-8BAE-4CD5-8764-851DFBE95FBF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "uWiki", "uWiki\uWiki.csproj", "{996601FA-5C0E-46A6-B39D-2863BADC80D8}" EndProject