Skip to content

Commit

Permalink
Merge pull request #6 from extnet/ExtJS_602
Browse files Browse the repository at this point in the history 
Update to Ext.NET 4.1.0
  • Loading branch information
@DaniilVeriga
DaniilVeriga committed May 10, 2016
2 parents 1891f85 + 2bc3f0f commit 7893a99
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/Default.aspx
View file
Expand Up @@ -135,15 +135,15 @@
Cls="platform-selector"
runat="server"
Width="450px"
Text="Web Forms Examples Explorer (4.0)"
Text="Web Forms Examples Explorer (4.1)"
Height="70px"
ArrowVisible="false">
<Menu >
<ext:Menu Cls ="platform-selector-dropdown" Plain="true" runat="server">
<Items>
<ext:MenuItem
runat="server"
Text="MVC Examples Explorer (4.0)"
Text="MVC Examples Explorer (4.1)"
Href="http://mvc.ext.net/"
Height="70px"
Width="448px"
Expand Down Expand Up @@ -175,8 +175,8 @@
<Content>
<ul id="nav-menu" class="nav-menu">
<li class="section-title">Ext.NET 4</li>
<li><a href="http://examples.ext.net/">Web Forms Examples (4.0)</a></li>
<li><a href="http://mvc.ext.net/">MVC Examples (4.0)</a></li>
<li><a href="http://examples.ext.net/">Web Forms Examples (4.1)</a></li>
<li><a href="http://mvc.ext.net/">MVC Examples (4.1)</a></li>
<li class="separator"></li>
<li class="section-title">Ext.NET 3</li>
<li><a href="http://examples3.ext.net/">Web Forms Examples (3.3)</a></li>
Expand Down
3 changes: 0 additions & 3 deletions src/Examples/GridPanel/Locking_Grid/GroupingSummary_with_group_headers/Default.aspx
View file
Expand Up @@ -273,9 +273,6 @@
</Items>
</ext:Toolbar>
</TopBar>
<SelectionModel>
<ext:CellSelectionModel runat="server" />
</SelectionModel>
</ext:GridPanel>
</form>
</body>
Expand Down
46 changes: 44 additions & 2 deletions src/Examples/MessageBox/InfoPanel/Overview/Default.aspx
View file
@@ -1,6 +1,50 @@
<%@ Page Language="C#" %>

<script runat="server">
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack && !X.IsAjaxRequest)
{
var curTheme = Ext.Net.ResourceManager.GetInstance(HttpContext.Current);
Window1.Width = 250;
Window1.Height = 350;
switch (curTheme.Theme)
{
case Ext.Net.Theme.Triton:
Window1.Width = 310;
Window1.Height = 556;
break;
case Ext.Net.Theme.CrispTouch:
Window1.Width = 330;
Window1.Height = 525;
break;
case Ext.Net.Theme.Gray:
case Ext.Net.Theme.Default:
//Window1.Height = 503; // left comment as an example/reference
break;
case Ext.Net.Theme.Crisp:
Window1.Width = 275;
Window1.Height = 391;
break;
case Ext.Net.Theme.Neptune:
Window1.Width = 290;
Window1.Height = 427;
break;
case Ext.Net.Theme.Aria:
Window1.Width = 320;
Window1.Height = 427;
break;
case Ext.Net.Theme.NeptuneTouch:
Window1.Width = 340;
Window1.Height = 559;
break;
}
}
}
protected void ShowSimple1_Click(object sender, DirectEventArgs e)
{
X.Msg.Info("Server time", DateTime.Now.ToShortTimeString()).Show();
Expand Down Expand Up @@ -131,8 +175,6 @@
ID="Window1"
runat="server"
Title="Notifications"
Width="300"
Height="400"
Layout="Accordion">
<Bin>
<ext:InfoPanelQueue
Expand Down
39 changes: 37 additions & 2 deletions src/Examples/MessageBox/Notification/Client-Side_Notification/Default.aspx
View file
Expand Up @@ -8,7 +8,44 @@
{
if (!X.IsAjaxRequest)
{
var curTheme = Ext.Net.ResourceManager.GetInstance(HttpContext.Current);
this.ResourceManager1.RegisterIcon(Icon.Information);
Window1.Width = 250;
Window1.Height = 350;
switch (curTheme.Theme)
{
case Ext.Net.Theme.Triton:
Window1.Width = 310;
Window1.Height = 556;
break;
case Ext.Net.Theme.CrispTouch:
Window1.Width = 330;
Window1.Height = 525;
break;
case Ext.Net.Theme.Gray:
case Ext.Net.Theme.Default:
//Window1.Height = 503; // left comment as an example/reference
break;
case Ext.Net.Theme.Crisp:
Window1.Width = 275;
Window1.Height = 391;
break;
case Ext.Net.Theme.Neptune:
Window1.Width = 290;
Window1.Height = 427;
break;
case Ext.Net.Theme.Aria:
Window1.Width = 320;
Window1.Height = 427;
break;
case Ext.Net.Theme.NeptuneTouch:
Window1.Width = 340;
Window1.Height = 559;
break;
}
}
}
</script>
Expand Down Expand Up @@ -36,8 +73,6 @@
ID="Window1"
runat="server"
Title="Notifications"
Width="300"
Height="400"
Layout="Accordion">
<Items>
<ext:MenuPanel runat="server" Title="Basic Align" SaveSelection="false">
Expand Down
39 changes: 37 additions & 2 deletions src/Examples/MessageBox/Notification/Overview/Default.aspx
View file
Expand Up @@ -5,7 +5,44 @@
{
if (!X.IsAjaxRequest)
{
var curTheme = Ext.Net.ResourceManager.GetInstance(HttpContext.Current);
this.ResourceManager1.RegisterIcon(Icon.Information);
Window1.Width = 250;
Window1.Height = 350;
switch (curTheme.Theme)
{
case Ext.Net.Theme.Triton:
Window1.Width = 310;
Window1.Height = 556;
break;
case Ext.Net.Theme.CrispTouch:
Window1.Width = 330;
Window1.Height = 525;
break;
case Ext.Net.Theme.Gray:
case Ext.Net.Theme.Default:
//Window1.Height = 503; // left comment as an example/reference
break;
case Ext.Net.Theme.Crisp:
Window1.Width = 275;
Window1.Height = 391;
break;
case Ext.Net.Theme.Neptune:
Window1.Width = 290;
Window1.Height = 427;
break;
case Ext.Net.Theme.Aria:
Window1.Width = 320;
Window1.Height = 427;
break;
case Ext.Net.Theme.NeptuneTouch:
Window1.Width = 340;
Window1.Height = 559;
break;
}
}
}
Expand Down Expand Up @@ -377,8 +414,6 @@
ID="Window1"
runat="server"
Title="Notifications"
Width="300"
Height="400"
Layout="Accordion">
<Items>
<ext:MenuPanel runat="server" Title="Basic Align" SaveSelection="false">
Expand Down
6 changes: 3 additions & 3 deletions src/Ext.Net.Examples.csproj
View file
Expand Up @@ -124,8 +124,8 @@
<Reference Include="Wilco.SyntaxHighlighter, Version=0.5.0.0, Culture=neutral, PublicKeyToken=fb87150479c2990b, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup Condition=" ('$(Configuration)|$(Platform)' == 'Release|AnyCPU') Or ('$(Configuration)|$(Platform)' == 'Debug|AnyCPU')">
<Reference Include="Ext.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2e12ce3d0176cd87, processorArchitecture=MSIL">
<HintPath>..\packages\Ext.NET.4.0.0\lib\net45\Ext.Net.dll</HintPath>
<Reference Include="Ext.Net, Version=4.1.0.0, Culture=neutral, PublicKeyToken=2e12ce3d0176cd87, processorArchitecture=MSIL">
<HintPath>..\packages\Ext.NET.4.1.0\lib\net45\Ext.Net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ext.Net.Utilities, Version=2.5.0.0, Culture=neutral, PublicKeyToken=2c34ac34702a3c23, processorArchitecture=MSIL">
Expand Down Expand Up @@ -158,7 +158,7 @@
</Reference>
</ItemGroup>
<ItemGroup Condition=" ('$(Configuration)|$(Platform)' == 'Development|AnyCPU') ">
<Reference Include="Ext.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2e12ce3d0176cd87, processorArchitecture=MSIL">
<Reference Include="Ext.Net, Version=4.1.0.0, Culture=neutral, PublicKeyToken=2e12ce3d0176cd87, processorArchitecture=MSIL">
<HintPath>..\..\Premium\src\bin\Debug\Ext.Net.dll</HintPath>
<Private>True</Private>
</Reference>
Expand Down
6 changes: 3 additions & 3 deletions src/Properties/AssemblyInfo.cs
View file
Expand Up @@ -2,9 +2,9 @@
using System.Runtime.InteropServices;
using System.Web.UI;

[assembly: AssemblyVersion("4.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
[assembly: AssemblyInformationalVersion("4.0.0")]
[assembly: AssemblyVersion("4.1")]
[assembly: AssemblyFileVersion("4.1.0.0")]
[assembly: AssemblyInformationalVersion("4.1.0")]
[assembly: AssemblyCompany("Object.NET, Inc.")]
[assembly: AssemblyCopyright("Copyright (c) 2008-2016 Object.NET, Inc.")]
[assembly: AssemblyTitle("Ext.NET Examples")]
Expand Down
2 changes: 1 addition & 1 deletion src/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ext.NET" version="4.0.0" targetFramework="net45" />
<package id="Ext.NET" version="4.1.0" targetFramework="net45" />
<package id="Ext.NET.Utilities" version="2.5.0" targetFramework="net45" />
<package id="jQuery" version="2.1.4" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
Expand Down

0 comments on commit 7893a99

Please sign in to comment.