Merge branch 'v7-upgrade-test' of https://github.com/umbraco/OurUmbraco into v7-upgrade-test
Conflicts: OurUmbraco.Site/Assets/css/style.min.css
This commit is contained in:
TimGeyssens
@@ -1,7 +1,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.34014
|
||||
// Runtime Version:4.0.30319.34209
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
@@ -9,7 +9,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//
|
||||
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.34014.
|
||||
// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.34209.
|
||||
//
|
||||
#pragma warning disable 1591
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace Marketplace.com.umbraco {
|
||||
|
||||
|
||||
/// <remarks/>
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")]
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.ComponentModel.DesignerCategoryAttribute("code")]
|
||||
[System.Web.Services.WebServiceBindingAttribute(Name="MemberLookUpSoap", Namespace="http://tempuri.org/")]
|
||||
@@ -123,7 +123,7 @@ namespace Marketplace.com.umbraco {
|
||||
}
|
||||
|
||||
/// <remarks/>
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.33440")]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")]
|
||||
[System.SerializableAttribute()]
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.ComponentModel.DesignerCategoryAttribute("code")]
|
||||
@@ -228,11 +228,11 @@ namespace Marketplace.com.umbraco {
|
||||
}
|
||||
|
||||
/// <remarks/>
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")]
|
||||
public delegate void GetMemberDataCompletedEventHandler(object sender, GetMemberDataCompletedEventArgs e);
|
||||
|
||||
/// <remarks/>
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.33440")]
|
||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")]
|
||||
[System.Diagnostics.DebuggerStepThroughAttribute()]
|
||||
[System.ComponentModel.DesignerCategoryAttribute("code")]
|
||||
public partial class GetMemberDataCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
|
||||
|
||||
+184
-165
@@ -1,88 +1,89 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
|
||||
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
|
||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="Marketplace.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||
<section name="Marketplace.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
|
||||
<section name="umbraco.presentation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
<!-- Added in Umbraco 4.6.2 -->
|
||||
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
|
||||
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
|
||||
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
|
||||
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
|
||||
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
<section name="MarketplaceProviders" type="Marketplace.Providers.MarketplaceProviderConfiguration, Marketplace.Providers" />
|
||||
<section name="MarketplaceProviders" type="Marketplace.Providers.MarketplaceProviderConfiguration, Marketplace.Providers"/>
|
||||
<!-- End of added in Umbraco 4.6.2 -->
|
||||
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" /></configSections>
|
||||
<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false"/>
|
||||
</configSections>
|
||||
<appSettings>
|
||||
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=our;user id=sa;password=password!" />
|
||||
<add key="umbracoConfigurationStatus" value="4.7.0" />
|
||||
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx" />
|
||||
<add key="umbracoReservedPaths" value="~/umbraco,~/install/,~/communityLogoGenerator" />
|
||||
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" />
|
||||
<add key="umbracoStorageDirectory" value="~/App_Data" />
|
||||
<add key="umbracoPath" value="~/umbraco" />
|
||||
<add key="umbracoEnableStat" value="false" />
|
||||
<add key="umbracoHideTopLevelNodeFromPath" value="true" />
|
||||
<add key="umbracoEditXhtmlMode" value="true" />
|
||||
<add key="umbracoUseDirectoryUrls" value="true" />
|
||||
<add key="umbracoDebugMode" value="true" />
|
||||
<add key="umbracoTimeOutInMinutes" value="20" />
|
||||
<add key="umbracoVersionCheckPeriod" value="7" />
|
||||
<add key="umbracoDisableXsltExtensions" value="true" />
|
||||
<add key="umbracoDefaultUILanguage" value="en" />
|
||||
<add key="umbracoProfileUrl" value="member" />
|
||||
<add key="umbracoUseSSL" value="false" />
|
||||
<add key="umbracoUseMediumTrust" value="false" />
|
||||
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=our;user id=sa;password=password!"/>
|
||||
<add key="umbracoConfigurationStatus" value="4.7.0"/>
|
||||
<add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx"/>
|
||||
<add key="umbracoReservedPaths" value="~/umbraco,~/install/,~/communityLogoGenerator"/>
|
||||
<add key="umbracoContentXML" value="~/App_Data/umbraco.config"/>
|
||||
<add key="umbracoStorageDirectory" value="~/App_Data"/>
|
||||
<add key="umbracoPath" value="~/umbraco"/>
|
||||
<add key="umbracoEnableStat" value="false"/>
|
||||
<add key="umbracoHideTopLevelNodeFromPath" value="true"/>
|
||||
<add key="umbracoEditXhtmlMode" value="true"/>
|
||||
<add key="umbracoUseDirectoryUrls" value="true"/>
|
||||
<add key="umbracoDebugMode" value="true"/>
|
||||
<add key="umbracoTimeOutInMinutes" value="20"/>
|
||||
<add key="umbracoVersionCheckPeriod" value="7"/>
|
||||
<add key="umbracoDisableXsltExtensions" value="true"/>
|
||||
<add key="umbracoDefaultUILanguage" value="en"/>
|
||||
<add key="umbracoProfileUrl" value="member"/>
|
||||
<add key="umbracoUseSSL" value="false"/>
|
||||
<add key="umbracoUseMediumTrust" value="false"/>
|
||||
<!--
|
||||
Set this to true to enable storing the xml cache locally to the IIS server even if the app files are stored centrally on a SAN/NAS
|
||||
Alex Norcliffe 2010 02 for 4.1 -->
|
||||
<add key="umbracoContentXMLUseLocalTemp" value="false" />
|
||||
<add key="umbracoContentXMLUseLocalTemp" value="false"/>
|
||||
<!-- Added in Umbraco 4.6.2 -->
|
||||
<add key="webpages:Enabled" value="false" />
|
||||
<add key="enableSimpleMembership" value="false" />
|
||||
<add key="autoFormsAuthentication" value="false" />
|
||||
<add key="webpages:Enabled" value="false"/>
|
||||
<add key="enableSimpleMembership" value="false"/>
|
||||
<add key="autoFormsAuthentication" value="false"/>
|
||||
<!-- End of added in Umbraco 4.6.2 -->
|
||||
<!-- Deli settings -->
|
||||
<add key="deliProjectRoot" value="1113" />
|
||||
<add key="deliWebServiceUser" value="Deli" />
|
||||
<add key="deliWebServicePass" value="DeliDeliDeli" />
|
||||
<add key="deliPayPalTest" value="true" />
|
||||
<add key="deliCartRoot" value="1113" />
|
||||
<add key="deliPayPalReturnUrl" value="1113" />
|
||||
<add key="deli_VAT" value="0.25" />
|
||||
<add key="deliProjectRoot" value="1113"/>
|
||||
<add key="deliWebServiceUser" value="Deli"/>
|
||||
<add key="deliWebServicePass" value="DeliDeliDeli"/>
|
||||
<add key="deliPayPalTest" value="true"/>
|
||||
<add key="deliCartRoot" value="1113"/>
|
||||
<add key="deliPayPalReturnUrl" value="1113"/>
|
||||
<add key="deli_VAT" value="0.25"/>
|
||||
<!-- End Deli settings -->
|
||||
</appSettings>
|
||||
<system.net>
|
||||
<mailSettings>
|
||||
<smtp>
|
||||
<network host="mx01.fab-it.dk" />
|
||||
<network host="mx01.fab-it.dk"/>
|
||||
</smtp>
|
||||
</mailSettings>
|
||||
</system.net>
|
||||
<!-- REMOVE FOR BETA -->
|
||||
<!-- added by NH to test foreign membership providers-->
|
||||
<connectionStrings>
|
||||
<remove name="LocalSqlServer" />
|
||||
<add name="LocalSqlServer" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=C:\USERS\HARTVIG\DOCUMENTS\VISUAL STUDIO 2005\WEBSITES\AJAXENABLEDWEBSITE2\APP_DATA\ASPNETDB.MDF;Integrated Security=True" providerName="System.Data.SqlClient" />
|
||||
<add name="Marketplace.Data.Properties.Settings.ourConnectionString" connectionString="Data Source=PETER-MAC-PC\SQLEXPRESS;Initial Catalog=our;Persist Security Info=True;User ID=sa;Password=password!" providerName="System.Data.SqlClient" />
|
||||
<remove name="LocalSqlServer"/>
|
||||
<add name="LocalSqlServer" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=C:\USERS\HARTVIG\DOCUMENTS\VISUAL STUDIO 2005\WEBSITES\AJAXENABLEDWEBSITE2\APP_DATA\ASPNETDB.MDF;Integrated Security=True" providerName="System.Data.SqlClient"/>
|
||||
<add name="Marketplace.Data.Properties.Settings.ourConnectionString" connectionString="Data Source=PETER-MAC-PC\SQLEXPRESS;Initial Catalog=our;Persist Security Info=True;User ID=sa;Password=password!" providerName="System.Data.SqlClient"/>
|
||||
</connectionStrings>
|
||||
<MarketplaceProviders default="ListingProvider">
|
||||
<providers>
|
||||
<add name="ListingProvider" type="Marketplace.Providers.Listing.NodeListingProvider, Marketplace.Providers" />
|
||||
<add name="VendorProvider" type="Marketplace.Providers.Vendor.MemberVendorProvider, Marketplace.Providers" />
|
||||
<add name="MediaProvider" type="Marketplace.Providers.MediaFile.UWikiMediaProvider, Marketplace.Providers" />
|
||||
<add name="TagProvider" type="Marketplace.Providers.Tags.UmbracoProjectTagProvider, Marketplace.Providers" />
|
||||
<add name="CategoryProvider" type="Marketplace.Providers.Category.UmbracoCategoryProvider, Marketplace.Providers" />
|
||||
<add name="LicenseProvider" type="Marketplace.Providers.License.LicenseProvider, Marketplace.Providers" />
|
||||
<add name="CartProvider" type="Marketplace.Providers.Cart.UmbracoEcommerceCartProvider, Marketplace.Providers" />
|
||||
<add name="OrderProvider" type="Marketplace.Providers.Orders.UmbracoEcommerceOrderProvider, Marketplace.Providers" />
|
||||
<add name="MemberProvider" type="Marketplace.Providers.Members.DeliMemberProvider, Marketplace.Providers" />
|
||||
<add name="memberLicenseProvider" type="Marketplace.Providers.MemberLicense.MemberLicenseProvider, Marketplace.Providers" />
|
||||
<add name="OrderItemProvider" type="Marketplace.Providers.OrderItem.DeliOrderItemProvider, Marketplace.Providers" />
|
||||
<add name="OrderNoteProvider" type="Marketplace.Providers.OrderNote.OrderNoteProvider, Marketplace.Providers" />
|
||||
<add name="PaymentInfoProvider" type="Marketplace.Providers.PaymentInfo.UmbracoEcommercePaymentInfoProvider, Marketplace.Providers" />
|
||||
<add name="PayoutProvider" type="Marketplace.Providers.Payout.PayoutProvider, Marketplace.Providers" />
|
||||
<add name="ListingProvider" type="Marketplace.Providers.Listing.NodeListingProvider, Marketplace.Providers"/>
|
||||
<add name="VendorProvider" type="Marketplace.Providers.Vendor.MemberVendorProvider, Marketplace.Providers"/>
|
||||
<add name="MediaProvider" type="Marketplace.Providers.MediaFile.UWikiMediaProvider, Marketplace.Providers"/>
|
||||
<add name="TagProvider" type="Marketplace.Providers.Tags.UmbracoProjectTagProvider, Marketplace.Providers"/>
|
||||
<add name="CategoryProvider" type="Marketplace.Providers.Category.UmbracoCategoryProvider, Marketplace.Providers"/>
|
||||
<add name="LicenseProvider" type="Marketplace.Providers.License.LicenseProvider, Marketplace.Providers"/>
|
||||
<add name="CartProvider" type="Marketplace.Providers.Cart.UmbracoEcommerceCartProvider, Marketplace.Providers"/>
|
||||
<add name="OrderProvider" type="Marketplace.Providers.Orders.UmbracoEcommerceOrderProvider, Marketplace.Providers"/>
|
||||
<add name="MemberProvider" type="Marketplace.Providers.Members.DeliMemberProvider, Marketplace.Providers"/>
|
||||
<add name="memberLicenseProvider" type="Marketplace.Providers.MemberLicense.MemberLicenseProvider, Marketplace.Providers"/>
|
||||
<add name="OrderItemProvider" type="Marketplace.Providers.OrderItem.DeliOrderItemProvider, Marketplace.Providers"/>
|
||||
<add name="OrderNoteProvider" type="Marketplace.Providers.OrderNote.OrderNoteProvider, Marketplace.Providers"/>
|
||||
<add name="PaymentInfoProvider" type="Marketplace.Providers.PaymentInfo.UmbracoEcommercePaymentInfoProvider, Marketplace.Providers"/>
|
||||
<add name="PayoutProvider" type="Marketplace.Providers.Payout.PayoutProvider, Marketplace.Providers"/>
|
||||
</providers>
|
||||
</MarketplaceProviders>
|
||||
<!--
|
||||
@@ -94,101 +95,107 @@
|
||||
</system.Web>
|
||||
-->
|
||||
<system.web>
|
||||
<httpRuntime requestValidationMode="2.0" />
|
||||
<httpRuntime requestValidationMode="2.0"/>
|
||||
<!-- <trust level="Medium" originUrl=".*" />-->
|
||||
<customErrors mode="Off" />
|
||||
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
|
||||
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
|
||||
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
|
||||
<xhtmlConformance mode="Strict" />
|
||||
<customErrors mode="Off"/>
|
||||
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true"/>
|
||||
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20"/>
|
||||
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8"/>
|
||||
<xhtmlConformance mode="Strict"/>
|
||||
<pages enableEventValidation="false" controlRenderingCompatibilityVersion="4.0">
|
||||
<!-- ASPNETAJAX -->
|
||||
<controls>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco" />
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add tagPrefix="umbraco" namespace="umbraco.presentation.templateControls" assembly="umbraco"/>
|
||||
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
</controls>
|
||||
<namespaces>
|
||||
<add namespace="ClientDependency.Core" />
|
||||
<add namespace="ClientDependency.Core.Mvc" /></namespaces></pages>
|
||||
<namespaces>
|
||||
<add namespace="ClientDependency.Core"/>
|
||||
<add namespace="ClientDependency.Core.Mvc"/>
|
||||
</namespaces>
|
||||
</pages>
|
||||
<httpModules>
|
||||
<!-- URL REWRTIER -->
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter"/>
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule"/>
|
||||
<!-- UMBRACO -->
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule"/>
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule"/>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<!-- CLIENT DEPENDENCY -->
|
||||
<!-- ** Need to add the dependency module --><add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></httpModules>
|
||||
<!-- ** Need to add the dependency module -->
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
|
||||
</httpModules>
|
||||
<httpHandlers>
|
||||
<remove verb="*" path="*.asmx" />
|
||||
<remove verb="*" path="*.asmx"/>
|
||||
<!-- ASPNETAJAX -->
|
||||
<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
|
||||
<add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
|
||||
<!-- UMBRACO CHANNELS -->
|
||||
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
<!-- ** Need to add the dependency handler --><add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
|
||||
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
|
||||
<add verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " /></httpHandlers>
|
||||
<compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.5.1">
|
||||
<add verb="*" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco"/>
|
||||
<add verb="*" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco"/>
|
||||
<!-- ** Need to add the dependency handler -->
|
||||
<add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
<add verb="GET,HEAD,POST" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
|
||||
<add verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
</httpHandlers>
|
||||
<compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.5">
|
||||
<assemblies>
|
||||
<!-- ASP.NET 4.0 Assemblies -->
|
||||
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
|
||||
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
|
||||
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
|
||||
<add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
|
||||
</assemblies>
|
||||
<!-- Added in Umbraco 4.6.2 -->
|
||||
<buildProviders>
|
||||
<add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
|
||||
<add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
|
||||
<add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
|
||||
<add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
|
||||
<add extension=".vbhtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
|
||||
<add extension=".razor" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines"/>
|
||||
</buildProviders>
|
||||
<!-- End of added in Umbraco 4.6.2 -->
|
||||
</compilation>
|
||||
<authentication mode="Forms">
|
||||
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
|
||||
<forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/"/>
|
||||
</authentication>
|
||||
<authorization>
|
||||
<allow users="?" />
|
||||
<allow users="?"/>
|
||||
</authorization>
|
||||
<!-- Membership Provider -->
|
||||
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed" />
|
||||
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" />
|
||||
<clear/>
|
||||
<add name="UmbracoMembershipProvider" type="umbraco.providers.members.UmbracoMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Another Type" passwordFormat="Hashed"/>
|
||||
<add name="UsersMembershipProvider" type="umbraco.providers.UsersMembershipProvider" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false"/>
|
||||
</providers>
|
||||
</membership>
|
||||
<!-- added by NH to support membership providers in access layer -->
|
||||
<roleManager enabled="true" defaultProvider="UmbracoRoleProvider">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
|
||||
<clear/>
|
||||
<add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider"/>
|
||||
</providers>
|
||||
</roleManager>
|
||||
<!-- Sitemap provider-->
|
||||
<siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
|
||||
<providers>
|
||||
<clear />
|
||||
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
|
||||
<clear/>
|
||||
<add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
|
||||
</providers>
|
||||
</siteMap>
|
||||
</system.web>
|
||||
<!-- ASPNETAJAX -->
|
||||
<system.web.extensions>
|
||||
<scripting>
|
||||
<scriptResourceHandler enableCompression="true" enableCaching="true" />
|
||||
<scriptResourceHandler enableCompression="true" enableCaching="true"/>
|
||||
<webServices>
|
||||
<jsonSerialization maxJsonLength="500000" />
|
||||
<jsonSerialization maxJsonLength="500000"/>
|
||||
</webServices>
|
||||
</scripting>
|
||||
</system.web.extensions>
|
||||
@@ -208,105 +215,117 @@
|
||||
</umbraco.presentation.Properties.Settings>
|
||||
</applicationSettings>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<validation validateIntegratedModeConfiguration="false"/>
|
||||
<modules runAllManagedModulesForAllRequests="true">
|
||||
<remove name="ScriptModule" />
|
||||
<remove name="UrlRewriteModule" />
|
||||
<remove name="umbracoRequestModule" />
|
||||
<remove name="viewstateMoverModule" />
|
||||
<remove name="umbracoBaseRequestModule" />
|
||||
<remove name="ClientDependencyModule" />
|
||||
<remove name="ScriptModule"/>
|
||||
<remove name="UrlRewriteModule"/>
|
||||
<remove name="umbracoRequestModule"/>
|
||||
<remove name="viewstateMoverModule"/>
|
||||
<remove name="umbracoBaseRequestModule"/>
|
||||
<remove name="ClientDependencyModule"/>
|
||||
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
|
||||
<remove name="FormsAuthentication" />
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<!-- ** Need to add the dependency module --><add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
|
||||
<remove name="FormsAuthentication"/>
|
||||
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter"/>
|
||||
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule"/>
|
||||
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule"/>
|
||||
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule"/>
|
||||
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<!-- ** Need to add the dependency module -->
|
||||
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
|
||||
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
|
||||
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" /></modules>
|
||||
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
|
||||
<add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
|
||||
</modules>
|
||||
<handlers accessPolicy="Read, Write, Script, Execute">
|
||||
<!-- ** Need to add the dependency handler --><remove name="WebServiceHandlerFactory-Integrated" />
|
||||
<remove name="ScriptHandlerFactory" />
|
||||
<remove name="ScriptHandlerFactoryAppServices" />
|
||||
<remove name="ScriptResource" />
|
||||
<remove name="Channels" />
|
||||
<remove name="Channels_Word" />
|
||||
<remove name="ClientDependency" />
|
||||
<remove name="SpellChecker" />
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
|
||||
<add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco" />
|
||||
<add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco" />
|
||||
<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
|
||||
<add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco" />
|
||||
<!-- ** Need to add the dependency handler -->
|
||||
<remove name="WebServiceHandlerFactory-Integrated"/>
|
||||
<remove name="ScriptHandlerFactory"/>
|
||||
<remove name="ScriptHandlerFactoryAppServices"/>
|
||||
<remove name="ScriptResource"/>
|
||||
<remove name="Channels"/>
|
||||
<remove name="Channels_Word"/>
|
||||
<remove name="ClientDependency"/>
|
||||
<remove name="SpellChecker"/>
|
||||
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
|
||||
<add verb="*" name="Channels" preCondition="integratedMode" path="umbraco/channels.aspx" type="umbraco.presentation.channels.api, umbraco"/>
|
||||
<add verb="*" name="Channels_Word" preCondition="integratedMode" path="umbraco/channels/word.aspx" type="umbraco.presentation.channels.wordApi, umbraco"/>
|
||||
<add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
<add verb="GET,HEAD,POST" preCondition="integratedMode" name="SpellChecker" path="GoogleSpellChecker.ashx" type="umbraco.presentation.umbraco_client.tinymce3.plugins.spellchecker.GoogleSpellChecker,umbraco"/>
|
||||
<!-- Wiki upload handler -->
|
||||
<add verb="*" name="wiki_upload" path="umbraco/wiki/upload.aspx" type="uWiki.WikiFileUploadHandler, uWiki" />
|
||||
<add verb="*" name="wiki_upload" path="umbraco/wiki/upload.aspx" type="uWiki.WikiFileUploadHandler, uWiki"/>
|
||||
<!-- project upload handler -->
|
||||
<add verb="*" name="project_upload" path="umbraco/project/upload.aspx" type="Marketplace.ProjectFileUploadHandler, Marketplace" />
|
||||
<add verb="*" name="project_upload" path="umbraco/project/upload.aspx" type="Marketplace.ProjectFileUploadHandler, Marketplace"/>
|
||||
<!-- default member avatar -->
|
||||
<add verb="*" name="default_avatar" path="media/avatar/*.jpg" type="our.DefaultMemberAvatarHandler, our.umbraco.org" />
|
||||
<add verb="*" name="default_avatar" path="media/avatar/*.jpg" type="our.DefaultMemberAvatarHandler, our.umbraco.org"/>
|
||||
<!-- deli PayPal IPN handlers -->
|
||||
<add verb="*" name="ipn_dev" path="umbraco/ipn/dev.aspx" type=" Marketplace.HttpHandlers.PayPalIPNHandlerTEST, Marketplace" />
|
||||
<add verb="*" name="ipn_dev" path="umbraco/ipn/dev.aspx" type=" Marketplace.HttpHandlers.PayPalIPNHandlerTEST, Marketplace"/>
|
||||
<!-- deli PayPal IPN handlers
|
||||
<add verb="*" name="ipn_production" path="umbraco/ipn/production.aspx" type=" Umbraco.Shop.HttpHandlers.IpnProduction, Marketplace" />
|
||||
-->
|
||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" /><remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" /><remove name="ExtensionlessUrlHandler-Integrated-4.0" /><add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" /><add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" /><add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /><remove name="DependencyHandler" /><add name="DependencyHandler" preCondition="integratedMode" verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " /></handlers>
|
||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
|
||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
|
||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0"/>
|
||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0"/>
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||
<remove name="DependencyHandler"/>
|
||||
<add name="DependencyHandler" preCondition="integratedMode" verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core "/>
|
||||
</handlers>
|
||||
<httpProtocol>
|
||||
<customHeaders>
|
||||
<add name="P3P" value="policyref="http://our.umbraco.org/w3c/p3p.xml"" />
|
||||
<add name="P3P" value="policyref="http://our.umbraco.org/w3c/p3p.xml""/>
|
||||
</customHeaders>
|
||||
</httpProtocol>
|
||||
<urlCompression doDynamicCompression="true" />
|
||||
<urlCompression doDynamicCompression="true"/>
|
||||
</system.webServer>
|
||||
<runtime>
|
||||
<!-- Old asp.net ajax assembly bindings -->
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35" />
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
|
||||
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="4.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
||||
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<!-- Added in Umbraco 4.6.2 -->
|
||||
<system.web.webPages.razor>
|
||||
<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines" />
|
||||
<host factoryType="umbraco.MacroEngines.RazorUmbracoFactory, umbraco.MacroEngines"/>
|
||||
<pages pageBaseType="umbraco.MacroEngines.DynamicNodeContext">
|
||||
<namespaces>
|
||||
<add namespace="Microsoft.Web.Helpers" />
|
||||
<add namespace="umbraco" />
|
||||
<add namespace="Examine" />
|
||||
<add namespace="Microsoft.Web.Helpers"/>
|
||||
<add namespace="umbraco"/>
|
||||
<add namespace="Examine"/>
|
||||
</namespaces>
|
||||
</pages>
|
||||
</system.web.webPages.razor>
|
||||
<!-- End of added in Umbraco 4.6.2 -->
|
||||
<clientDependency version="1">
|
||||
<!-- Full config documentation is here: https://github.com/Shandem/ClientDependency/wiki/Configuration -->
|
||||
</clientDependency></configuration>
|
||||
<clientDependency version="1">
|
||||
<!-- Full config documentation is here: https://github.com/Shandem/ClientDependency/wiki/Configuration -->
|
||||
</clientDependency>
|
||||
</configuration>
|
||||
@@ -80,4 +80,186 @@
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="4" version="ForumTopicActionsMacro" url="ForumTopicActionsMacro" name="ForumTopicActionsMacro" folder="ae319ac9-6d9e-4447-8dc9-9c187104ef75" packagepath="~/media/created-packages/ForumTopicActionsMacro_ForumTopicActionsMacro.zip" repositoryGuid="" packageGuid="442b6c3d-9ff3-4fc4-a95b-451d32bc844c" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="ForumTopicActionsMacro">ForumTopicActionsMacro</author>
|
||||
<readme><![CDATA[ForumTopicActionsMacro]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>147</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="5" version="stub" url="stub" name="ForumForumActionsMacro" folder="85d9c2cb-6e2e-46b6-a45c-cf95f976a65a" packagepath="~/media/created-packages/ForumForumActionsMacro_stub.zip" repositoryGuid="" packageGuid="b773884d-4b83-4c36-8d99-7bb08f41975b" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>148</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="6" version="stub" url="stub" name="MembersMacros1" folder="5201abfb-db26-4cf4-bb7f-af89c30f7ebb" packagepath="~/media/created-packages/MembersMacros1_stub.zip" repositoryGuid="" packageGuid="92b3f949-e3a2-475e-8851-52ae8f7f5bdb" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>20,151</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="7" version="stub" url="stub" name="NewMacros" folder="56d9e646-b72b-41c9-9628-ac6859e7c5b4" packagepath="~/media/created-packages/NewMacros_stub.zip" repositoryGuid="" packageGuid="6a51e666-4f3c-4fa3-87d5-f495222b2008" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>20,139,140,141,142,144,145,147,148,151</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="8" version="stub" url="stub" name="NavigationMacro" folder="a0c7b3da-7599-4ac1-92b2-6f6996d61961" packagepath="~/media/created-packages/NavigationMacro_stub.zip" repositoryGuid="" packageGuid="484c273c-f63a-4e37-8bbf-1b64b426ebce" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>3,146</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="9" version="stub" url="stub" name="Macros23021400" folder="7d7c5cd7-b45b-40b7-828e-20717daaeb08" packagepath="~/media/created-packages/Macros23021400_stub.zip" repositoryGuid="" packageGuid="dd8df0e9-6b94-476b-9551-aa5fd57ae442" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>3,20,139,140,141,142,144,145,146,147,148,151</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
<package id="10" version="stub" url="stub" name="NewMacros25021100" folder="5598c7f8-a022-4ab8-b937-4fe547939099" packagepath="~/media/created-packages/NewMacros25021100_stub.zip" repositoryGuid="" packageGuid="3c135611-8a91-4baa-844d-ecd025b5a048" hasUpdate="False" enableSkins="False" skinRepoGuid="00000000-0000-0000-0000-000000000000">
|
||||
<license url="http://opensource.org/licenses/MIT">MIT License</license>
|
||||
<author url="stub">stub</author>
|
||||
<readme><![CDATA[stub]]></readme>
|
||||
<actions>
|
||||
</actions>
|
||||
<datatypes>
|
||||
</datatypes>
|
||||
<content nodeId="" loadChildNodes="False">
|
||||
</content>
|
||||
<templates>
|
||||
</templates>
|
||||
<stylesheets>
|
||||
</stylesheets>
|
||||
<documenttypes>
|
||||
</documenttypes>
|
||||
<macros>40</macros>
|
||||
<files>
|
||||
</files>
|
||||
<languages>
|
||||
</languages>
|
||||
<dictionaryitems>
|
||||
</dictionaryitems>
|
||||
<loadcontrol>
|
||||
</loadcontrol>
|
||||
</package>
|
||||
</packages>
|
||||
Vendored
+59
-1
@@ -19,6 +19,64 @@ jQuery(document).ready(function (){
|
||||
bodyVar.removeClass('quickmenu');
|
||||
});
|
||||
|
||||
//project search
|
||||
$('.project-search-input').keyup(function(ev) {
|
||||
var term = $('.project-search-input').val();
|
||||
var defaultListing = $('.projects-default-listing');
|
||||
var searchListing = $('.projects-search-listing');
|
||||
|
||||
|
||||
if(term.length === 0){
|
||||
defaultListing.show();
|
||||
searchListing.empty();
|
||||
}
|
||||
|
||||
if(term.length > 3){
|
||||
var url = "/umbraco/api/OurSearch/GetProjectSearchResults";
|
||||
var template = _.template(
|
||||
$( "script.search-item-project" ).html()
|
||||
);
|
||||
|
||||
//get search from server
|
||||
$.ajax({
|
||||
dataType: "json",
|
||||
url: url,
|
||||
data: {term: term},
|
||||
success: function(response){
|
||||
|
||||
//toggle and empty box
|
||||
defaultListing.hide();
|
||||
searchListing.empty();
|
||||
|
||||
if(response.items.length === 0){
|
||||
var linkhtml = '<p>No results found</p>';
|
||||
searchListing.append(linkhtml);
|
||||
}
|
||||
|
||||
//iterate
|
||||
_.each(response.items, function(item){
|
||||
|
||||
var image = item.Fields.image.length > 0 ? item.Fields.image : "<i class='icon-Box'></i>";
|
||||
var itemData = {
|
||||
nodeName: item.Fields.nodeName,
|
||||
body: _.escape(item.Fields.body.substring(0, 150)),
|
||||
url: item.Fields.url,
|
||||
karma: item.Fields.karma,
|
||||
downloads: item.Fields.downloads,
|
||||
versions: item.Fields.versions,
|
||||
image: item.Fields.image
|
||||
};
|
||||
|
||||
|
||||
searchListing.append(
|
||||
template( itemData )
|
||||
);
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Frontpage search
|
||||
$('.search-input').keyup(function(ev) {
|
||||
@@ -64,7 +122,7 @@ jQuery(document).ready(function (){
|
||||
);
|
||||
});
|
||||
|
||||
var linkhtml = '<li class="searc-view-all"><a href="/search?term=' + response.term + '">View All ' + response.total + ' results</a></li>';
|
||||
var linkhtml = '<li class="search-view-all"><a href="/search?q=' + response.term + '">View All ' + response.total + ' results</a></li>';
|
||||
$('.search-all ul').append(linkhtml);
|
||||
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<RootNamespace>OurUmbraco.Site</RootNamespace>
|
||||
<AssemblyName>OurUmbraco.Site</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<IISExpressSSLPort />
|
||||
<IISExpressAnonymousAuthentication />
|
||||
<IISExpressWindowsAuthentication />
|
||||
@@ -1763,6 +1763,8 @@
|
||||
<Content Include="Views\MacroPartials\Documenation\Breadcrumb.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Documenation\DisplayMarkdown.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Documenation\Navigation.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Projects\ListCategories.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Projects\ListProjects.cshtml" />
|
||||
<Content Include="Views\MacroPartials\Members\ProfileNavigation.cshtml" />
|
||||
<None Include="Views\Partials\Forum\MemberBadge.cshtml" />
|
||||
<Content Include="Views\Web.config" />
|
||||
@@ -4703,7 +4705,7 @@
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>24292</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:5555</IISUrl>
|
||||
<IISUrl>http://our.local</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
@inherits Umbraco.Web.Macros.PartialViewMacroPage
|
||||
|
||||
|
||||
@* Ensure that the Current Page has children, where the property umbracoNaviHide is not True *@
|
||||
<ul class="level-2">
|
||||
@* For each child page under the root node, where the property umbracoNaviHide is not True *@
|
||||
@foreach (var childPage in CurrentPage.ProjectGroups.Where("Visible"))
|
||||
{
|
||||
<li>
|
||||
<h4><a href="@childPage.Url">@childPage.Name</a></h4>
|
||||
</li>
|
||||
}
|
||||
</ul>
|
||||
@@ -0,0 +1,135 @@
|
||||
@inherits Umbraco.Web.Macros.PartialViewMacroPage
|
||||
|
||||
|
||||
<div class="search-big">
|
||||
<input type="search" class="project-search-input" required placeholder="Search for packages">
|
||||
<label for="search">Search packages</label>
|
||||
</div>
|
||||
|
||||
<h1>Browse packages</h1>
|
||||
|
||||
@{
|
||||
our.Examine.OurSearcher searcher = new our.Examine.OurSearcher();
|
||||
searcher.NodeTypeAlias = "project";
|
||||
searcher.OrderBy = "updateDate";
|
||||
var result = searcher.Search().Take(50);
|
||||
}
|
||||
|
||||
@functions{
|
||||
public string ParseVersion(string version){
|
||||
|
||||
var versions = version.Trim(',').Split(',').Select(x => decimal.Parse(x));
|
||||
|
||||
if (versions.Count() == 0)
|
||||
return string.Empty;
|
||||
|
||||
if (versions.Count() == 1)
|
||||
return (versions.First())+ "+";
|
||||
|
||||
var high = versions.Max();
|
||||
var low = versions.Min();
|
||||
|
||||
return high.ToString("N2") + "-" + low.ToString("N2");
|
||||
}
|
||||
}
|
||||
|
||||
<script type="text/template" class="search-item-project">
|
||||
<div class="box">
|
||||
<div class="row">
|
||||
<div class="col-xs-2 col-md-1">
|
||||
<img src="{{image}}" alt="">
|
||||
</div>
|
||||
|
||||
<div class="col-xs-10 col-md-6">
|
||||
<div class="forum-thread-text">
|
||||
<h3><a href="{{url}}">{{nodeName}}</a></h3>
|
||||
<p>{{body}}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-5">
|
||||
<div class="other">
|
||||
<div class="package-badge">
|
||||
<span class="package-name">version</span>
|
||||
<span class="package-number">{{versions}}</span>
|
||||
</div>
|
||||
|
||||
<span class="stats">
|
||||
<span class="downloads">
|
||||
{{downloads}}<span><i class="icon-Download-alt"></i></span>
|
||||
</span>
|
||||
|
||||
<span class="karma">
|
||||
{{karma}}<span><i class="icon-Hearts"></i></span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
<div class="projects-search-listing"></div>
|
||||
<div class="projects-default-listing">
|
||||
@foreach (var childPage in result)
|
||||
{
|
||||
<div class="box">
|
||||
<div class="row">
|
||||
<div class="col-xs-2 col-md-1">
|
||||
<img src="@childPage.Fields["image"]" alt="">
|
||||
</div>
|
||||
|
||||
<div class="col-xs-10 col-md-6">
|
||||
<div class="forum-thread-text">
|
||||
<h3><a href="@childPage.Fields["url"]">@childPage.Fields["nodeName"]</a></h3>
|
||||
<p>@childPage.Fields["body"].Truncate(150)</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-5">
|
||||
<div class="other">
|
||||
<div class="package-badge">
|
||||
<span class="package-name">version</span>
|
||||
<span class="package-number">@ParseVersion(childPage.Fields["versions"])</span>
|
||||
</div>
|
||||
|
||||
<span class="stats">
|
||||
<span class="downloads">
|
||||
@childPage.Fields["downloads"]<span><i class="icon-Download-alt"></i></span>
|
||||
</span>
|
||||
|
||||
<span class="karma">
|
||||
@childPage.Fields["karma"]<span><i class="icon-Hearts"></i></span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
<nav class="pagination" role="navigation">
|
||||
<a class="prev" href="#">Prev</a>
|
||||
<a class="active" href="#">1</a>
|
||||
<a href="#">2</a>
|
||||
<a href="#">3</a>
|
||||
<a href="#">4</a>
|
||||
<a href="#">5</a>
|
||||
<a href="#">6</a>
|
||||
<a href="#">7</a>
|
||||
<a class="next" href="#">Next</a>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@* Ensure that the Current Page has children, where the property umbracoNaviHide is not True *@
|
||||
@if (CurrentPage.Children.Where("Visible").Any())
|
||||
{
|
||||
<ul>
|
||||
@* For each child page under the root node, where the property umbracoNaviHide is not True *@
|
||||
|
||||
</ul>
|
||||
}
|
||||
@@ -80,6 +80,11 @@ More information and documentation can be found on CodePlex: http://umbracoexami
|
||||
<add Name="updateDate" EnableSorting="true" />
|
||||
<add Name="url"/>
|
||||
<add Name="nodeTypeAlias" />
|
||||
|
||||
<add Name="karma" EnableSorting="true" />
|
||||
<add Name="downloads" />
|
||||
<add Name="image" />
|
||||
<add Name="versions" />
|
||||
</IndexUserFields>
|
||||
|
||||
</IndexSet>
|
||||
|
||||
@@ -59,7 +59,9 @@ More information and documentation can be found on CodePlex: http://umbracoexami
|
||||
|
||||
<add name="MultiIndexSearcher"
|
||||
type="Examine.LuceneEngine.Providers.MultiIndexSearcher, Examine"
|
||||
indexSets="ForumIndexSet,projectIndexSet,documentationIndexSet"/>
|
||||
indexSets="ForumIndexSet,projectIndexSet,documentationIndexSet"
|
||||
enableLeadingWildcards="true"
|
||||
/>
|
||||
|
||||
</providers>
|
||||
</ExamineSearchProviders>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
IEnumerable<ICategory> cats = categoryProvider.GetAllCategories();
|
||||
var selected = "";
|
||||
}
|
||||
<h3>By Category</h3>
|
||||
<h3>Project Categories</h3>
|
||||
<ul>
|
||||
@foreach (var cat in cats)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
@inherits umbraco.MacroEngines.DynamicNodeContext
|
||||
@using Marketplace.uVersion;
|
||||
@{
|
||||
var versions = UVersion.GetAllVersions();
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
@inherits umbraco.MacroEngines.DynamicNodeContext
|
||||
@using Marketplace.Razor;
|
||||
@{
|
||||
int fileId = Int32.Parse(Parameter.fileId);
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
<div class="sidebar-content">
|
||||
<div class="content-wrapper">
|
||||
|
||||
|
||||
|
||||
<umbraco:Macro source="1057" Alias="[Member]ProfileNavigation" runat="server"></umbraco:Macro>
|
||||
|
||||
</div><!-- .content-wrapper -->
|
||||
@@ -25,8 +27,9 @@
|
||||
<div class="content-wrapper">
|
||||
|
||||
|
||||
|
||||
|
||||
<umbraco:Macro linkToCurrent="1" Alias="Breadcrumb" runat="server"></umbraco:Macro>
|
||||
|
||||
|
||||
<umbraco:Macro Alias="Deli-CreateProject" runat="server"></umbraco:Macro>
|
||||
|
||||
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
|
||||
<asp:ContentPlaceHolder ID="Head" runat="server"></asp:ContentPlaceHolder>
|
||||
|
||||
<script>
|
||||
var _prum = [['id', '529dbcf6abe53d055a000000'],
|
||||
['mark', 'firstbyte', (new Date()).getTime()]];
|
||||
@@ -58,7 +59,7 @@
|
||||
var model = UmbracoContext.Current.PublishedContentRequest.PublishedContent;
|
||||
%>
|
||||
|
||||
<body class="<%= model.Level > 2 && model.AncestorOrSelf(3).Id == 1057 ? "profile has-sidebar" : model.DocumentTypeAlias.ToLower().Replace(" ","-") %>">
|
||||
<body class="<%= model.Level > 2 && model.AncestorOrSelf(3).Id == 1057 ? "profile has-sidebar" : model.DocumentTypeAlias.ToLower().Replace(" ","-")+"-page" %>">
|
||||
|
||||
<umbraco:Macro Alias="[Members]QuickMenu" runat="server"></umbraco:Macro>
|
||||
|
||||
|
||||
@@ -1,47 +1,19 @@
|
||||
<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
|
||||
|
||||
<asp:Content ContentPlaceHolderId="Head" runat="server">
|
||||
<script type="text/javascript" src="/scripts/projects/projects.js?v=4"></script>
|
||||
<script type="text/javascript" src="/scripts/projects/jquery.tagger.js"></script>
|
||||
<script type="text/javascript" src="/scripts/projects/jquery.autocomplete.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/css/shadowbox.css" />
|
||||
|
||||
<script type="text/javascript" src="/scripts/shadowbox/shadowbox.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
Shadowbox.init({overlayColor:'#000000',overlayOpacity: '0.7',onFinish:addClickClose});
|
||||
|
||||
function addClickClose(){
|
||||
$('#sb-content').unbind('click').click(function(){ Shadowbox.close(); });
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderId="Main" runat="server">
|
||||
<div id="body" class="subpage">
|
||||
|
||||
<div style="margin-top: 25px;">
|
||||
<umbraco:Macro linkToCurrent="0" Alias="Breadcrumb" runat="server"></umbraco:Macro>
|
||||
<umbraco:Macro linkToCurrent="0" Alias="Breadcrumb" runat="server"></umbraco:Macro>
|
||||
<h1><umbraco:Item Field="nodeName" runat="server" /></h1>
|
||||
<div id="forum" style="width:620px; margin-left: 75px">
|
||||
|
||||
<% if( umbraco.presentation.nodeFactory.Node.GetCurrent().Children.Count > 0 ){ %>
|
||||
<h3>Package discussions</h3>
|
||||
<umbraco:Macro Alias="Forum-overview" runat="server"></umbraco:Macro>
|
||||
<%
|
||||
}
|
||||
%>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<umbraco:Macro Alias="Deli-ProjectView" runat="server"></umbraco:Macro>
|
||||
|
||||
|
||||
<div id="forum" style="width:620px; margin-left: 75px">
|
||||
|
||||
<% if( umbraco.presentation.nodeFactory.Node.GetCurrent().Children.Count > 0 ){ %>
|
||||
<h3>Package discussions</h3>
|
||||
<umbraco:Macro Alias="Forum-overview" runat="server"></umbraco:Macro>
|
||||
<%
|
||||
}
|
||||
%>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</asp:Content>
|
||||
<asp:Content ContentPlaceHolderId="EndScripts" runat="server">
|
||||
<asp:literal runat="server" id="EndScriptsLit"/>
|
||||
</asp:Content>
|
||||
@@ -1,94 +1,59 @@
|
||||
<%@ Master Language="C#" MasterPageFile="~/masterpages/Master.master" AutoEventWireup="true" %>
|
||||
|
||||
<asp:Content ContentPlaceHolderId="Head" runat="server">
|
||||
<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js"></script>
|
||||
<script id="listing-result" type="text/x-jquery-tmpl">
|
||||
<li class="clearfix">
|
||||
<div class="deliPackage">
|
||||
|
||||
<div class="brief">
|
||||
<a href="{{= NiceUrl}}" class="packageIcon" style="background:url({{= DefaultScreenShot}}) no-repeat top left;">Package</a>
|
||||
|
||||
<h3><a href="{{= NiceUrl}}">
|
||||
{{= Name}}
|
||||
</a></h3>
|
||||
|
||||
<div class="category">{{= CategoryName}}</div>
|
||||
|
||||
|
||||
<div class='commercialIndicator {{= ListingType}}'>{{= ListingType}}</div>
|
||||
</div>
|
||||
|
||||
<div class="hiLite">
|
||||
|
||||
<p><a href="{{= NiceUrl}}">{{= Description}}</a></p>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="popularity">
|
||||
<div class="karma">
|
||||
{{= Karma}}
|
||||
<small>Karma</small>
|
||||
</div>
|
||||
<div class="downloads">
|
||||
{{= Downloads}}
|
||||
<small>Downloads</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</script>
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ContentPlaceHolderId="Main" runat="server">
|
||||
<h2 class="sectionTitle">Welcome to Projects. The home for Umbraco packages, add-ons and extensions</h2>
|
||||
<div id="body" class="subpage">
|
||||
<div class="page-content">
|
||||
|
||||
<div class="sidebar-area">
|
||||
<div class="sidebar-content">
|
||||
<div class="content-wrapper">
|
||||
|
||||
<div class="options">
|
||||
<%if(umbraco.library.IsLoggedOn()){ %>
|
||||
<a class="act add" href="/member/profile/projects">Create a new project</a>
|
||||
<% } %>
|
||||
</div>
|
||||
<nav>
|
||||
<ul class="level-1">
|
||||
<li class="open">
|
||||
<a><h3>Packages</h3></a>
|
||||
<ul class="level-2">
|
||||
<li><h4><a href="#">Newest packages</a></h4></li>
|
||||
<li><h4><a href="#">Popular packages</a></h4></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<div class="deliLeft">
|
||||
<div class="deliNav">
|
||||
<h3>Packages</h3>
|
||||
<ul>
|
||||
<li><a href="/projects/popular">Popular packages</a></li>
|
||||
<li><a href="projects/newest">Newest packages</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="deliNav">
|
||||
<umbraco:Macro Alias="Deli-ProjectCategories" runat="server"></umbraco:Macro>
|
||||
</div>
|
||||
<div class="deliNav">
|
||||
<h3>By Umbraco Version</h3>
|
||||
<p><small>Choose your Umbraco version to get a list of packages that have been marked as compatible for that version.</small></p>
|
||||
<umbraco:Macro runat="server" Language="cshtml" Cache="600" FileLocation="~/macroScripts/ProjectsVersionList.cshtml"/>
|
||||
</div>
|
||||
</div>
|
||||
<li>
|
||||
<a href><h3>By Version</h3></a>
|
||||
<ul class="level-2">
|
||||
<li><h4><a href="#">Version 7</a></h4></li>
|
||||
<li><h4><a href="#">Version 6</a></h4></li>
|
||||
<li><h4><a href="#">Version 4</a></h4></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<div class="deliRightWrapper">
|
||||
|
||||
<div class="deliRight">
|
||||
<div class="deliFeatureBox clearfix">
|
||||
<umbraco:Macro projectId="[#featuredProject]" FeatureImage="[#featuredProjectImage]" Alias="Deli-FeatureProject" runat="server"></umbraco:Macro>
|
||||
</div>
|
||||
<div class="deliPromoArea projectWidgets">
|
||||
|
||||
<umbraco:Macro MaxPageSize="8" paged="0" ListingType="[@pplt]" Alias="Deli-PopularProjects" runat="server"></umbraco:Macro>
|
||||
<umbraco:Macro MaxPageSize="4" paged="0" ListingType="[@nplt]" Alias="Deli-NewestProjects" runat="server"></umbraco:Macro>
|
||||
<li >
|
||||
<a href><h3>By Category</h3></a>
|
||||
<umbraco:Macro Alias="[Projects]ListCategories" runat="server"></umbraco:Macro>
|
||||
</li>
|
||||
|
||||
</div>
|
||||
<div class="deliPromoBox deliTags">
|
||||
<h2>Browse by Tag</h2>
|
||||
<umbraco:Macro ID="Macro1" Alias="Deli-TagCloud" runat="server"></umbraco:Macro>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
</div><!-- .content-wrapper -->
|
||||
</div><!-- .sidebar-content -->
|
||||
</div><!-- .sidebar-area -->
|
||||
|
||||
<div class="main-area">
|
||||
<div class="main-content">
|
||||
<div class="content-wrapper">
|
||||
<div>
|
||||
<umbraco:Macro linkToCurrent="1" Alias="Breadcrumb" runat="server"></umbraco:Macro>
|
||||
</div>
|
||||
|
||||
<div class="packages-content">
|
||||
<umbraco:Macro Alias="[Projects]ListProjects" runat="server"></umbraco:Macro>
|
||||
</div>
|
||||
|
||||
</div><!-- .content-wrapper -->
|
||||
</div><!-- .main-content -->
|
||||
</div><!-- .main-area -->
|
||||
|
||||
</div><!-- .page-content -->
|
||||
</asp:Content>
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
jQuery.validator.addMethod("CompareFields", function (value, element) { return value == $("#<%= UserEmail.ClientID %>").val(); }, $("#<%= UserEmail.ClientID %>").attr("tooltip"));
|
||||
|
||||
jQuery.validator.addMethod("ValidateVatFormat", function (value, element) { if(value.length > 0){return checkVATNumber (value);}else{ return true;} }, $("#<%= CompanyVat.ClientID %>").attr("tooltip"));
|
||||
jQuery.validator.addMethod("ValidateVatFormat", function (value, element) { if (value.length > 0) { return checkVATNumber(value); } else { return true; } }, $("#<%= CompanyVat.ClientID %>").attr("tooltip"));
|
||||
|
||||
$("form").validate({
|
||||
invalidHandler: function (f, v) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Editor.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Editor" %>
|
||||
|
||||
|
||||
<div class="package-create">
|
||||
<asp:Repeater runat="server" ID="StepNavigation" OnItemDataBound="bindStep">
|
||||
<HeaderTemplate><ul class="stepNavigation"></HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
@@ -11,4 +11,5 @@
|
||||
|
||||
<input type="hidden" runat="server" value="details" id="Step" />
|
||||
<asp:PlaceHolder runat="server" ID="StepPlaceHolder" />
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Complete.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Complete" %>
|
||||
|
||||
|
||||
<h1>Complete and Send Live</h1>
|
||||
<asp:PlaceHolder ID="eligibilityNotice" runat="server">
|
||||
<div class='eligibilityNotification <%=NotificationClass %>'>
|
||||
<asp:Literal runat="server" ID="NotificationMessage" />
|
||||
@@ -18,5 +16,5 @@
|
||||
|
||||
<div class="buttons">
|
||||
<asp:linkbutton runat="server" Text="Previous" ID="MovePrevious" OnClick="MoveLast"/>
|
||||
<asp:Button runat="server" Text="Save" ID="MoveNext" OnClick="Complete_Click" CssClass="submitButton"/>
|
||||
<asp:Button runat="server" Text="Save" ID="MoveNext" OnClick="Complete_Click" CssClass="submitButton button tiny green"/>
|
||||
</div>
|
||||
@@ -1,6 +1,5 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Details.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Details" %>
|
||||
|
||||
<h1>Project Details</h1>
|
||||
<div class="form simpleForm" id="registrationForm">
|
||||
<fieldset>
|
||||
<legend>Project Information</legend>
|
||||
@@ -118,7 +117,7 @@
|
||||
</asp:PlaceHolder>
|
||||
|
||||
<div class="buttons">
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton"/>
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton button green tiny"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -145,4 +144,5 @@
|
||||
remove_linebreaks: false
|
||||
});
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Files.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Files" %>
|
||||
<h1>Files</h1>
|
||||
<div class="files">
|
||||
<asp:PlaceHolder ID="holder" runat="server" Visible="false">
|
||||
<script type="text/javascript">
|
||||
var swfu;
|
||||
@@ -161,7 +161,7 @@
|
||||
<fieldset>
|
||||
<legend>Upload file</legend>
|
||||
|
||||
<div id="swfu_container" style="margin: 0px 10px;">
|
||||
<div id="swfu_container">
|
||||
|
||||
<div id="swfu_controls">
|
||||
|
||||
@@ -193,15 +193,17 @@
|
||||
<option value="source">Source Code</option>
|
||||
</select>
|
||||
</p>
|
||||
|
||||
<div class="pickversionWrapper">
|
||||
<p id="pickVersion">
|
||||
<label class="inputLabel">Choose umbraco version</label>
|
||||
|
||||
<p id="pickVersion">
|
||||
<label class="inputLabel">Choose umbraco version</label>
|
||||
<div style="float:left">
|
||||
|
||||
</p>
|
||||
<div class="pickVersion">
|
||||
<asp:literal ID="lt_versions" runat="server" />
|
||||
</div>
|
||||
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<p id="pickNetVersion">
|
||||
<label class="inputLabel">Choose supported .NET runtime</label>
|
||||
|
||||
@@ -219,13 +221,13 @@
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<input type="button" value="Upload file" id="btn_submit" />
|
||||
<input type="button" value="Upload file" id="btn_submit" class="button tiny" />
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<asp:linkbutton runat="server" Text="Previous" ID="MovePrevious" OnClick="MoveLast"/>
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton"/>
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton button green tiny"/>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
@@ -234,4 +236,5 @@
|
||||
|
||||
|
||||
</div>
|
||||
</asp:PlaceHolder>
|
||||
</asp:PlaceHolder>
|
||||
</div>
|
||||
@@ -1,5 +1,4 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Licenses.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Licenses" %>
|
||||
<h1>Licenses</h1>
|
||||
<asp:PlaceHolder ID="holder" runat="server" Visible="false">
|
||||
<div class="form simpleForm" id="registrationForm">
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Screenshots.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Package.Steps.Screenshots" %>
|
||||
<h1>Screenshots</h1>
|
||||
<asp:PlaceHolder ID="holder" runat="server" Visible="false">
|
||||
<script type="text/javascript">
|
||||
var swfu;
|
||||
@@ -112,7 +111,7 @@
|
||||
<fieldset>
|
||||
<legend>Upload file</legend>
|
||||
|
||||
<div id="swfu_container" style="margin: 0px 10px;">
|
||||
<div id="swfu_container">
|
||||
|
||||
<div id="swfu_controls">
|
||||
|
||||
@@ -134,7 +133,7 @@
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<input type="button" value="Upload file" id="btn_submit" />
|
||||
<input type="button" value="Upload file" id="btn_submit" class="button tiny"/>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
@@ -144,7 +143,7 @@
|
||||
|
||||
<div class="buttons">
|
||||
<asp:linkbutton runat="server" Text="Previous" ID="MovePrevious" OnClick="MoveLast"/>
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton"/>
|
||||
<asp:Button runat="server" Text="Next" ID="MoveNext" OnClick="SaveStep" CssClass="submitButton button tiny green" />
|
||||
</div>
|
||||
</div>
|
||||
</asp:PlaceHolder>
|
||||
@@ -107,9 +107,9 @@
|
||||
|
||||
<%--
|
||||
// temporary notification code.
|
||||
umbraco.library.SendMail("gregory@umbraco.dk", "gregory@umbraco.dk", "Payout requested", "Hey Niels, There's a payout requested. Check <a href=\"http://our.umbraco.org/umbraco/\">our.umbraco.org/umbraco/</a>",true);
|
||||
umbraco.library.SendMail("nh@umbraco.dk", "nh@umbraco.dk", "Payout requested", "Hey Niels, There's a payout requested. Check <a href=\"http://our.umbraco.org/umbraco/\">our.umbraco.org/umbraco/</a>",true);
|
||||
|
||||
--%>
|
||||
--%>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,96 +1,121 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="MyProjects.ascx.cs" Inherits="Marketplace.usercontrols.Deli.Profile.MyProjects" %>
|
||||
<%@ Import Namespace="Marketplace.Interfaces" %>
|
||||
<div class="profileProjectsHolder">
|
||||
<h3>Your existing projects</h3>
|
||||
<ul class="profileProjects">
|
||||
<asp:Repeater runat="server" ID="myProjects">
|
||||
<ItemTemplate>
|
||||
<li>
|
||||
<h3><a href="<%# Eval("NiceUrl") %>">
|
||||
<%# Eval("Name") %>
|
||||
</a></h3>
|
||||
<img src="/umbraco/imagegen.ashx?image=<%# GetIcon((string)Eval("DefaultScreenshot")) %>&pad=true&width=50&height=50" alt="<%# Eval("Name") %>" class="projectIcon" style="border:1px solid #ddd"/>
|
||||
<small>
|
||||
<%# ((DateTime)Eval("CreateDate")).ToString("D")%>
|
||||
</small>
|
||||
<ul class="projectNav">
|
||||
<li><a href="<%= editUrl %>?id=<%# Eval("Id") %>">Edit</a></li>
|
||||
<li><a href="<%= forumUrl %>?id=<%# Eval("Id") %>">Forums</a></li>
|
||||
|
||||
<%@ Import Namespace="Marketplace" %>
|
||||
<div class="profile-settings">
|
||||
<strong>My Packages</strong>
|
||||
<div class="profile-settings-packages packages-content">
|
||||
<div class="button green"><a href="<%= editUrl %>"><i class="icon-Add"></i>Add package</a></div>
|
||||
<asp:Repeater runat="server" ID="myProjects">
|
||||
<ItemTemplate>
|
||||
|
||||
<asp:placeholder runat="server" Visible='<%# (((ListingType)Eval("ListingType")) == ListingType.commercial)?true:false %>'>
|
||||
<li><a href="<%= licenseUrl %>?id=<%# Eval("Id") %>">Licenses</a></li>
|
||||
</asp:placeholder>
|
||||
|
||||
<asp:placeholder ID="Placeholder1" runat="server" Visible='<%# (bool)Eval("OpenForCollab") %>'>
|
||||
<li><a href="<%= teamUrl %>?id=<%# Eval("Id") %>">Team</a></li>
|
||||
</asp:placeholder>
|
||||
</ul>
|
||||
</li>
|
||||
<div class="box liked">
|
||||
|
||||
</ItemTemplate>
|
||||
</asp:Repeater>
|
||||
<li class="add">
|
||||
<h3><a href="<%= editUrl %>">Add new project</a></h3>
|
||||
<img src="/css/img/add.png" alt="Add new project" />
|
||||
</li>
|
||||
</ul>
|
||||
<div class="row">
|
||||
|
||||
<asp:Repeater runat="server" ID="myTeamProjects">
|
||||
<HeaderTemplate>
|
||||
<h3>Project where you are contributor</h3>
|
||||
<ul class="profileProjects">
|
||||
</HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
<li>
|
||||
<h3><a href="<%# Eval("NiceUrl") %>">
|
||||
<%# Eval("Name") %>
|
||||
</a></h3>
|
||||
<img src="/umbraco/imagegen.ashx?image=<%# GetIcon((string)Eval("DefaultScreenshot")) %>&pad=true&width=50&height=50" alt="<%# Eval("Name") %>" class="projectIcon" style="border:1px solid #ddd"/>
|
||||
<small>
|
||||
<%# ((DateTime)Eval("CreateDate")).ToString("D") %><br />
|
||||
Owner: <a href="mailto:<%# ((IVendor)Eval("Vendor")).Member.Email %>"><%# ((IVendor)Eval("Vendor")).Member.Name %></a>
|
||||
</small>
|
||||
<ul class="projectNav">
|
||||
<li><a href="<%= editUrl %>?id=<%# Eval("Id") %>">Edit</a></li>
|
||||
<li><a href="<%= forumUrl %>?id=<%# Eval("Id") %>">Forums</a></li>
|
||||
|
||||
<div class="col-xs-2 col-md-1">
|
||||
<img src="/umbraco/imagegen.ashx?image=<%# GetIcon((string)Eval("DefaultScreenshot"))%>&pad=true&width=65&height=65 " alt="">
|
||||
</div>
|
||||
|
||||
<asp:placeholder runat="server" Visible='<%# (((ListingType)Eval("ListingType")) == ListingType.commercial)?true:false %>'>
|
||||
<li><a href="<%= licenseUrl %>?id=<%# Eval("Id") %>">Licenses</a></li>
|
||||
</asp:placeholder>
|
||||
</ul>
|
||||
</li>
|
||||
</ItemTemplate>
|
||||
<FooterTemplate>
|
||||
</ul>
|
||||
</FooterTemplate>
|
||||
</asp:Repeater>
|
||||
<div class="col-xs-10 col-md-6">
|
||||
<div class="forum-thread-text">
|
||||
<h3><a href="<%# Eval("NiceUrl") %>"><%# Eval("Name") %></a></h3>
|
||||
<p>
|
||||
<%# Eval("Description").ToString().StripHtmlAndLimit(45) %> ...
|
||||
<br />
|
||||
<a href="<%= editUrl %>?id=<%# Eval("Id") %>">Edit</a>
|
||||
<a href="<%= forumUrl %>?id=<%# Eval("Id") %>">Forums</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-5">
|
||||
<div class="other">
|
||||
|
||||
<div class="package-badge">
|
||||
<span class="package-name">version</span>
|
||||
<span class="package-number"><%# Eval("CurrentVersion") %></span>
|
||||
</div>
|
||||
|
||||
<span class="stats">
|
||||
<span class="downloads">
|
||||
<%# Eval("Downloads") %><span><i class="icon-Download-alt"></i></span>
|
||||
</span>
|
||||
|
||||
<span class="karma">
|
||||
<%# Eval("Karma") %><span><i class="icon-Hearts"></i></span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</ItemTemplate>
|
||||
</asp:Repeater>
|
||||
|
||||
|
||||
<strong>Package Contributions</strong>
|
||||
<asp:Repeater runat="server" ID="myTeamProjects">
|
||||
|
||||
<ItemTemplate>
|
||||
|
||||
<div class="box liked">
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-xs-2 col-md-1">
|
||||
<img src="/umbraco/imagegen.ashx?image=<%# GetIcon((string)Eval("DefaultScreenshot"))%>&pad=true&width=65&height=65 " alt="">
|
||||
</div>
|
||||
|
||||
<div class="col-xs-10 col-md-6">
|
||||
<div class="forum-thread-text">
|
||||
<h3><a href="<%# Eval("NiceUrl") %>"><%# Eval("Name") %></a></h3>
|
||||
<p>
|
||||
<%# Eval("Description").ToString().StripHtmlAndLimit(45) %>
|
||||
|
||||
<br />
|
||||
<a href="<%= editUrl %>?id=<%# Eval("Id") %>">Edit</a>
|
||||
<a href="<%= forumUrl %>?id=<%# Eval("Id") %>">Forums</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-md-5">
|
||||
<div class="other">
|
||||
|
||||
<div class="package-badge">
|
||||
<span class="package-name">version</span>
|
||||
<span class="package-number"><%# Eval("CurrentVersion") %></span>
|
||||
</div>
|
||||
|
||||
<span class="stats">
|
||||
<span class="downloads">
|
||||
<%# Eval("Downloads") %><span><i class="icon-Download-alt"></i></span>
|
||||
</span>
|
||||
|
||||
<span class="karma">
|
||||
<%# Eval("Karma") %><span><i class="icon-Hearts"></i></span>
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</ItemTemplate>
|
||||
|
||||
</asp:Repeater>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<asp:LoginView ID="LoginView1" runat="server">
|
||||
<RoleGroups>
|
||||
<asp:RoleGroup Roles="Deli Vendor">
|
||||
<ContentTemplate>
|
||||
<div class="deliNotification sidebarNotification">
|
||||
<h3>Vendor Resources</h3>
|
||||
<p>The following resources will help you get started as a Deli Vendor. If you have any questions regarding Deli or the commercialization of your package please <a href="http://umbraco.com/contact">contact the Umbraco HQ</a></p>
|
||||
<ul class="linkList icons">
|
||||
<li><img src="/css/img/vsproject.png" /><strong><a href="/media/1095480/projectlicensing.zip">Download the sample project</a></strong><br />
|
||||
<small>This sample project will give you start on integrating Deli Licensing into your project</small></li>
|
||||
<li><img src="/css/img/terms.png" /><strong><a href="/wiki/deli/deli-vendor-terms/">Deli Terms & Conditions</a></strong><br />
|
||||
<small>Make sure you read and fully understand the deli licensing agreement</small></li>
|
||||
<li><img src="/css/img/terms.png" /><strong><a href="/wiki/deli/umbraco-deli-package-license-agreement-standard/">Deli Package License Agreement</a></strong><br />
|
||||
<small>Make sure you read and fully understand the deli licensing agreement</small></li>
|
||||
<li><img src="/css/img/info.png" /><strong><a href="/wiki/deli/deli-vendor-faq/">Deli FAQ's</a></strong><br />
|
||||
<small>View a selection of answers to common Deli Vendor Questions</small></li>
|
||||
<li><img src="/css/img/help.png" /><strong><a href="/member/profile/support-request/">Deli Support</a></strong><br />
|
||||
<small>Do you have any questions or issues please contact us via the Deli Vendor Support form.</small></li>
|
||||
</ul>
|
||||
</div>
|
||||
</ContentTemplate>
|
||||
</asp:RoleGroup>
|
||||
</RoleGroups>
|
||||
<LoggedInTemplate>
|
||||
</LoggedInTemplate>
|
||||
</asp:LoginView>
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="ProjectView.ascx.cs"
|
||||
Inherits="Marketplace.usercontrols.Deli.ProjectView" %>
|
||||
<%@ Import Namespace="Marketplace.Interfaces" %>
|
||||
<%@ Import Namespace="umbraco.cms.businesslogic.member" %>
|
||||
<div id="project">
|
||||
<div id="projectVotes">
|
||||
<div id="projectvoting" class="voting rounded" style="width: 60px">
|
||||
@@ -53,7 +52,7 @@
|
||||
Package Info</h2>
|
||||
<h3>
|
||||
Project Owner/Creator</h3>
|
||||
|
||||
|
||||
<div class="memberBadge rounded">
|
||||
<a href="/member/<%= Project.Vendor.Member.Id %>">
|
||||
<img alt="Avatar" class="photo" src="/media/avatar/<%= Project.Vendor.Member.Id %>.jpg" />
|
||||
@@ -87,13 +86,6 @@
|
||||
<div id="projectCompat" class="sideSection">
|
||||
<h3>
|
||||
Project Compatibility</h3>
|
||||
<% if (Member.GetCurrentMember() != null && Member.GetCurrentMember().Id == Project.Vendor.Member.Id)
|
||||
{
|
||||
%>
|
||||
<a href="/projectcompatibility?p=<%= Project.Id %>" target="_blank">Update compatible versions</a>
|
||||
<%
|
||||
}
|
||||
%>
|
||||
<p>
|
||||
<asp:PlaceHolder runat="server" ID="HasReports">
|
||||
<span class="compatSummary">
|
||||
|
||||
@@ -22,9 +22,22 @@ namespace our.Api
|
||||
result.total = searchResult.TotalItemCount;
|
||||
result.items = searchResult.Take(5);
|
||||
result.term = term;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
public dynamic GetProjectSearchResults(string term)
|
||||
{
|
||||
var searcher = new OurSearcher();
|
||||
searcher.Term = term;
|
||||
searcher.NodeTypeAlias = "project";
|
||||
var searchResult = searcher.Search();
|
||||
|
||||
dynamic result = new ExpandoObject();
|
||||
result.total = searchResult.TotalItemCount;
|
||||
result.items = searchResult.Take(20);
|
||||
result.term = term;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,12 +29,6 @@ namespace our.Examine
|
||||
|
||||
public ISearchResults Search()
|
||||
{
|
||||
var originalTerm = Term;
|
||||
Term = Term.Replace(" OR ", " ").Replace(" or ", " ");
|
||||
|
||||
// Replace double whitespaces with single space as they were giving errors
|
||||
Term = Regex.Replace(Term, @"\s{2,}", " ");
|
||||
|
||||
var multiIndexSearchProvider = (MultiIndexSearcher)ExamineManager.Instance.SearchProviderCollection["MultiIndexSearcher"];
|
||||
|
||||
var criteria = multiIndexSearchProvider.CreateSearchCriteria();
|
||||
@@ -48,10 +42,20 @@ namespace our.Examine
|
||||
criteria.OrderByDescending(OrderBy);
|
||||
}
|
||||
|
||||
var compiled = criteria
|
||||
.GroupedOr(new[] { "nodeName", "body", "description" }, Term)
|
||||
.Compile();
|
||||
|
||||
ISearchCriteria compiled;
|
||||
|
||||
if (string.IsNullOrEmpty(Term))
|
||||
compiled = criteria.NodeTypeAlias(NodeTypeAlias).Compile();
|
||||
else
|
||||
{
|
||||
Term = Term.Replace(" OR ", " ").Replace(" or ", " ");
|
||||
// Replace double whitespaces with single space as they were giving errors
|
||||
Term = Regex.Replace(Term, @"\s{2,}", " ");
|
||||
compiled = criteria
|
||||
.GroupedOr(new[] { "nodeName", "body", "description" }, Term)
|
||||
.Compile();
|
||||
}
|
||||
|
||||
//TODO: The result.TotalSearchResults will yield a max of 100 which is incorrect, this is an issue
|
||||
// in Examine, it needs to limit the results to 100 but still tell you how many in total
|
||||
|
||||
@@ -7,6 +7,7 @@ using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Umbraco.Core.Models;
|
||||
using our.Examine.DocumentationIndexDataService.Helper;
|
||||
using Umbraco.Core.Logging;
|
||||
|
||||
namespace our.ExamineServices
|
||||
{
|
||||
@@ -23,31 +24,56 @@ namespace our.ExamineServices
|
||||
simpleDataSet.RowData.Add("nodeTypeAlias", "project");
|
||||
simpleDataSet.RowData.Add("url", project.Url );
|
||||
|
||||
|
||||
var karma = our.Utills.GetProjectTotalKarma(project.Id);
|
||||
var files = uWiki.Businesslogic.WikiFile.CurrentFiles(project.Id);
|
||||
var downloads = our.Utills.GetProjectTotalDownloadCount(project.Id);
|
||||
|
||||
var image = files.Where(x => x.FileType == "screenshot").FirstOrDefault();
|
||||
var imageFile = "";
|
||||
if (image != null)
|
||||
imageFile = image.Path;
|
||||
|
||||
//Clean up version data before its included in the index
|
||||
int o;
|
||||
var version = project.GetProperty("compatibleVersions").Value;
|
||||
var versions = version.ToString().ToLower()
|
||||
.Replace("nan", "")
|
||||
.Replace("saved", "")
|
||||
.Replace("v", "")
|
||||
.Trim(',').Split(',')
|
||||
.Where(x => int.TryParse(x, out o))
|
||||
.Select(x => (decimal.Parse(x.PadRight(3, '0') ) / 100));
|
||||
|
||||
simpleDataSet.RowData.Add("karma", karma.ToString());
|
||||
simpleDataSet.RowData.Add("downloads", downloads.ToString());
|
||||
simpleDataSet.RowData.Add("image", imageFile);
|
||||
simpleDataSet.RowData.Add("versions", string.Join(",", versions));
|
||||
|
||||
return simpleDataSet;
|
||||
}
|
||||
|
||||
public IEnumerable<SimpleDataSet> GetAllData(string indexType)
|
||||
{
|
||||
var dataSets = new List<SimpleDataSet>();
|
||||
var i = 1; //unique id for each doc
|
||||
|
||||
var projects = Umbraco.Web.UmbracoContext.Current.ContentCache.GetByXPath("//Community/Projects//Project [approved='1']");
|
||||
var projects = Umbraco.Web.UmbracoContext.Current.ContentCache.GetByXPath("//Community/Projects//Project [projectLive='1']");
|
||||
|
||||
//index all projects
|
||||
foreach (var project in projects)
|
||||
for (int i = 0; i < projects.Count(); i++)
|
||||
{
|
||||
var project = projects.ElementAt(i);
|
||||
try
|
||||
{
|
||||
LogHelper.Debug(this.GetType(), "Indexing " + project.Name);
|
||||
|
||||
var simpleDataSet = new SimpleDataSet { NodeDefinition = new IndexedNode(), RowData = new Dictionary<string, string>() };
|
||||
simpleDataSet = MapProjectToSimpleDataIndexItem(project, simpleDataSet, project.Id, indexType);
|
||||
dataSets.Add(simpleDataSet);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
LogHelper.Error(this.GetType(), ex.Message, ex);
|
||||
}
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
return dataSets;
|
||||
|
||||
@@ -76,9 +76,19 @@ namespace our {
|
||||
{
|
||||
try
|
||||
{
|
||||
return Application.SqlHelper.ExecuteScalar<int>(
|
||||
" select count(*) from projectDownload where projectId = @id;",
|
||||
Application.SqlHelper.CreateParameter("@id", projectId));
|
||||
return Umbraco.Core.ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<int>("select count(*) from projectDownload where projectId = @0", projectId);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static int GetProjectTotalKarma(int projectId)
|
||||
{
|
||||
try
|
||||
{
|
||||
return Umbraco.Core.ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<int>("SELECT sum([points]) FROM [powersProject] where id = @0", projectId);
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -90,10 +100,7 @@ namespace our {
|
||||
{
|
||||
try
|
||||
{
|
||||
return Application.SqlHelper.ExecuteScalar<int>(
|
||||
"Select downloads from wikiFiles where id = @id;",
|
||||
Application.SqlHelper.CreateParameter("@id", fileId));
|
||||
|
||||
return Umbraco.Core.ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<int>("Select downloads from wikiFiles where id = @0", fileId);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
@@ -149,6 +149,24 @@ namespace our.usercontrols {
|
||||
fnode.Publish(new umbraco.BusinessLogic.User(0));
|
||||
fnode.Save();
|
||||
umbraco.library.UpdateDocumentCache(fnode.Id);
|
||||
|
||||
using (var fs = new ForumService())
|
||||
{
|
||||
Forum f = fs.GetById(fnode.Id);
|
||||
|
||||
if (f == null)
|
||||
{
|
||||
f = new Forum();
|
||||
f.Id = fnode.Id;
|
||||
f.ParentId = fnode.ParentId;
|
||||
f.SortOrder = 0;
|
||||
f.TotalTopics = 0;
|
||||
f.TotalComments = 0;
|
||||
f.LatestPostDate = DateTime.Now;
|
||||
fs.Save(f);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user