diff --git a/GPW/A2/Barcode.aspx b/GPW/A2/Barcode.aspx index 1c31b7e..c047f24 100644 --- a/GPW/A2/Barcode.aspx +++ b/GPW/A2/Barcode.aspx @@ -1,5 +1,16 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFullBCode.Master" AutoEventWireup="true" CodeBehind="Barcode.aspx.cs" Inherits="GPW.A2.Barcode" %> -<%@ Register src="~/WebUserControls/mod_bCodeTimb.ascx" tagname="mod_bCodeTimb" tagprefix="uc1" %> - - - +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Barcode.aspx.cs" Inherits="GPW.A2.Barcode" %> + + + + + + + + +
+
+ DEFAULT redirect +
+
+ + diff --git a/GPW/A2/Barcode.aspx.cs b/GPW/A2/Barcode.aspx.cs index 0c0db83..3a658c5 100644 --- a/GPW/A2/Barcode.aspx.cs +++ b/GPW/A2/Barcode.aspx.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using GPW_data; +using SteamWare; +using System; namespace GPW.A2 { @@ -12,10 +7,7 @@ namespace GPW.A2 { protected void Page_Load(object sender, EventArgs e) { - if (!Page.IsPostBack) - { - utils.mng.dailyDuties(); - } + Response.Redirect(memLayer.ML.CRS("GpwBCodeUrl")); } } } \ No newline at end of file diff --git a/GPW/A2/Barcode.aspx.designer.cs b/GPW/A2/Barcode.aspx.designer.cs index 15cf9ac..c7e7df7 100644 --- a/GPW/A2/Barcode.aspx.designer.cs +++ b/GPW/A2/Barcode.aspx.designer.cs @@ -3,22 +3,24 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace GPW.A2 { - - - public partial class Barcode { - +namespace GPW.A2 +{ + + + public partial class Barcode + { + /// - /// mod_bCodeTimb1 control. + /// form1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::GPW.WebUserControls.mod_bCodeTimb mod_bCodeTimb1; + protected global::System.Web.UI.HtmlControls.HtmlForm form1; } } diff --git a/GPW/A2/Default.aspx b/GPW/A2/Default.aspx index eec13bd..f626e3b 100644 --- a/GPW/A2/Default.aspx +++ b/GPW/A2/Default.aspx @@ -8,12 +8,9 @@
-
-

- Barcode

-

- Default page

-
+
+ DEFAULT redirect +
diff --git a/GPW/A2/Default.aspx.cs b/GPW/A2/Default.aspx.cs index c7df183..36d9846 100644 --- a/GPW/A2/Default.aspx.cs +++ b/GPW/A2/Default.aspx.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; +using SteamWare; +using System; namespace GPW.BarcodeArea { @@ -11,7 +7,7 @@ namespace GPW.BarcodeArea { protected void Page_Load(object sender, EventArgs e) { - Response.Redirect("~/A2/Barcode.aspx"); + Response.Redirect(memLayer.ML.CRS("GpwBCodeUrl")); } } } \ No newline at end of file diff --git a/GPW/A3/Default.aspx b/GPW/A3/Default.aspx index 8a4c335..a3d01ba 100644 --- a/GPW/A3/Default.aspx +++ b/GPW/A3/Default.aspx @@ -8,9 +8,9 @@
-
- -
+
+ DEFAULT redirect +
diff --git a/GPW/A3/Timbrature.aspx b/GPW/A3/Timbrature.aspx index cb7aaf3..e6edde0 100644 --- a/GPW/A3/Timbrature.aspx +++ b/GPW/A3/Timbrature.aspx @@ -8,9 +8,9 @@
-
- -
+
+ DEFAULT redirect +
diff --git a/GPW/Web.config b/GPW/Web.config index 2174d5b..0f91d00 100644 --- a/GPW/Web.config +++ b/GPW/Web.config @@ -121,7 +121,8 @@ - + +