From 9ad0a8bcdb2ed3366906d87199f8f6ef69f5f07d Mon Sep 17 00:00:00 2001
From: Samuele Locatelli
Date: Mon, 13 Feb 2017 11:31:59 +0100
Subject: [PATCH] modifica master x prime pagine
---
XPS/AnagraficaMappe.aspx | 19 +++--
XPS/AnagraficaMappe.aspx.cs | 3 +-
XPS/Bootstrap.Master | 22 +++---
XPS/Bootstrap.Master.cs | 1 +
XPS/Global.asax.cs | 3 +
XPS/Properties/AssemblyInfo.cs | 8 +--
XPS/WebUserControls/mod_testata.ascx | 41 ++++++++---
XPS/WebUserControls/mod_testata.ascx.cs | 54 ++++++++++----
.../mod_testata.ascx.designer.cs | 72 ++++++++++++-------
XPS/XPS.csproj | 29 ++++++++
XPS/menu.aspx | 18 +++--
XPS/menu.aspx.cs | 18 +----
XPS/update.aspx | 18 +++--
XPS/update.aspx.cs | 3 +-
XPS/update.aspx.designer.cs | 3 +-
XPS/vocabolario.aspx | 19 +++--
XPS/vocabolario.aspx.cs | 2 +-
XPS/vocabolario.aspx.designer.cs | 3 +-
XPS_app.sln | 20 ++++++
19 files changed, 251 insertions(+), 105 deletions(-)
diff --git a/XPS/AnagraficaMappe.aspx b/XPS/AnagraficaMappe.aspx
index 1b0a7a2..7ff48fb 100644
--- a/XPS/AnagraficaMappe.aspx
+++ b/XPS/AnagraficaMappe.aspx
@@ -1,9 +1,18 @@
-<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" Codebehind="AnagraficaMappe.aspx.cs" %>
+<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" CodeBehind="AnagraficaMappe.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_anagraficaMappe.ascx" TagName="mod_anagraficaMappe" TagPrefix="uc1" %>
-
-
-
-
+
+
+
+
+
+
<%: traduci("AnagraficaMappe") %>
+
+
+
+
+
+
+
diff --git a/XPS/AnagraficaMappe.aspx.cs b/XPS/AnagraficaMappe.aspx.cs
index 810cc9b..cdaed6f 100644
--- a/XPS/AnagraficaMappe.aspx.cs
+++ b/XPS/AnagraficaMappe.aspx.cs
@@ -8,8 +8,9 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
+using SteamWare;
-public partial class AnagraficaMappe : Flesk.Accelerator.Page //System.Web.UI.Page
+public partial class AnagraficaMappe : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
diff --git a/XPS/Bootstrap.Master b/XPS/Bootstrap.Master
index 7c8df5f..31380f6 100644
--- a/XPS/Bootstrap.Master
+++ b/XPS/Bootstrap.Master
@@ -1,4 +1,4 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="GMW.Bootstrap" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="XPS.Bootstrap" %>
<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %>
@@ -9,17 +9,17 @@
-
+
- GMW - <%: Page.Title %>
+ XPS - <%: Page.Title %>
- <%: Scripts.Render("~/bundles/modernizr") %>
- <%: Scripts.Render("~/bundles/jquery") %>
- <%: Scripts.Render("~/bundles/jqueryui") %>
- <%: Scripts.Render("~/bundles/bootSwitch") %>
+ <%: System.Web.Optimization.Scripts.Render("~/bundles/modernizr") %>
+ <%: System.Web.Optimization.Scripts.Render("~/bundles/jquery") %>
+ <%: System.Web.Optimization.Scripts.Render("~/bundles/jqueryui") %>
+ <%: System.Web.Optimization.Scripts.Render("~/bundles/bootSwitch") %>
@@ -80,13 +80,13 @@
<%: DateTime.Now %>
|
- <%: GMW_data.MagClass.magazzino.CodSoggCurrUser %>
+ <%: SteamWare.devicesAuthProxy.stObj.CognomeNome%>
- GMW
+ <%: SteamWare.memLayer.ML.CRS("CodModulo") %>
|
- 2010-<%: DateTime.Now.Year %> ©
+ 2010-<%: DateTime.Now.Year %>©
@@ -97,7 +97,7 @@
- <%: Scripts.Render("~/bundles/jSteamware") %>
+ <%: System.Web.Optimization.Scripts.Render("~/bundles/jSteamware") %>