Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inizio update master x naming

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-08 14:36:49 +01:00
parent d07448739e
commit 4e041f29bd
26 changed files with 160 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/About.aspx.cs
+1
View File
@@ -17,6 +17,7 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
// faccio reset... sessioni e vocabolario..
doReset();
}
MP-Tablet/Commenti.aspx.cs
+73 -68
View File
@@ -1,74 +1,79 @@
using System;
using SteamWare;
using System;
namespace MoonProTablet
{
public partial class Commenti : System.Web.UI.Page
public partial class Commenti : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
Session["TipoLink"] = "EditMacch";
//mod_commenti1.eh_newVal += mod_commenti1_eh_newVal;
//mod_commenti1.eh_reset += mod_commenti1_eh_reset;
//mod_dichiarazione1.eh_newVal += mod_dichiarazione1_eh_newVal;
mod_insComm1.eh_newVal += mod_insComm1_eh_newVal;
mod_insComm1.eh_reset += mod_insComm1_eh_reset;
mod_insComm1.eh_inserting += mod_insComm1_eh_inserting;
mod_commenti1.eh_reqEdit += mod_commenti1_eh_reqEdit;
mod_fermate1.eh_reqEdit += mod_fermate1_eh_reqEdit;
}
void mod_fermate1_eh_reqEdit(object sender, EventArgs e)
{
// avendo in sessione inizio fermata DEVO andare a pagina DichFermi, in modalità "ritroso", precompilare data/ora ed eventuale descizione...
Response.Redirect("Dichiarazione.aspx");
}
void mod_insComm1_eh_inserting(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(false);
}
void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
{
mod_insComm1.caricaCommento();
}
void mod_insComm1_eh_reset(object sender, EventArgs e)
{
showPnlDichiaraz(false);
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_insComm1_eh_newVal(object sender, EventArgs e)
{
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
{
// ricarico tutto!
Response.Redirect("Commenti.aspx");
}
void mod_commenti1_eh_reset(object sender, EventArgs e)
{
showPnlDichiaraz(false);
}
/// <summary>
/// richiesta ins nuovo evento...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_commenti1_eh_newVal(object sender, EventArgs e)
{
showPnlDichiaraz(true);
}
private void showPnlDichiaraz(bool showDich)
{
pnlEventi.Visible = !showDich;
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
Session["TipoLink"] = "EditMacch";
//mod_commenti1.eh_newVal += mod_commenti1_eh_newVal;
//mod_commenti1.eh_reset += mod_commenti1_eh_reset;
//mod_dichiarazione1.eh_newVal += mod_dichiarazione1_eh_newVal;
mod_insComm1.eh_newVal += mod_insComm1_eh_newVal;
mod_insComm1.eh_reset += mod_insComm1_eh_reset;
mod_insComm1.eh_inserting += mod_insComm1_eh_inserting;
mod_commenti1.eh_reqEdit += mod_commenti1_eh_reqEdit;
mod_fermate1.eh_reqEdit += mod_fermate1_eh_reqEdit;
}
void mod_fermate1_eh_reqEdit(object sender, EventArgs e)
{
// avendo in sessione inizio fermata DEVO andare a pagina DichFermi, in modalità "ritroso", precompilare data/ora ed eventuale descizione...
Response.Redirect("Dichiarazione.aspx");
}
void mod_insComm1_eh_inserting(object sender, EventArgs e)
{
mod_dettMacchina1.detailLevel(false);
}
void mod_commenti1_eh_reqEdit(object sender, EventArgs e)
{
mod_insComm1.caricaCommento();
}
void mod_insComm1_eh_reset(object sender, EventArgs e)
{
showPnlDichiaraz(false);
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_insComm1_eh_newVal(object sender, EventArgs e)
{
mod_commenti1.doUpdate();
mod_dettMacchina1.detailLevel(true);
}
void mod_dichiarazione1_eh_newVal(object sender, EventArgs e)
{
// ricarico tutto!
Response.Redirect("Commenti.aspx");
}
void mod_commenti1_eh_reset(object sender, EventArgs e)
{
showPnlDichiaraz(false);
}
/// <summary>
/// richiesta ins nuovo evento...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_commenti1_eh_newVal(object sender, EventArgs e)
{
showPnlDichiaraz(true);
}
private void showPnlDichiaraz(bool showDich)
{
pnlEventi.Visible = !showDich;
}
}
}
MP-Tablet/Default.aspx.cs
+9 -5
View File
@@ -3,11 +3,15 @@ using System;
namespace MoonProTablet
{
public partial class Default : System.Web.UI.Page
public partial class Default : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
Response.Redirect(memLayer.ML.confReadString("mainPage"));
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
Response.Redirect(memLayer.ML.confReadString("mainPage"));
}
}
}
MP-Tablet/DettaglioMacchina.aspx.cs
+1
View File
@@ -24,6 +24,7 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
Session["TipoLink"] = "DetMacc";
}
mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
MP-Tablet/Dichiarazione.aspx.cs
+1
View File
@@ -10,6 +10,7 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
Session["TipoLink"] = "EditMacch";
mod_dettMacchina1.detailLevel(true);
// se c'è una data/ora in sessione la imposto...
MP-Tablet/Logout.aspx.cs
+4
View File
@@ -8,6 +8,10 @@ namespace MoonProTablet
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
// elimina il device da db...
string cookieName = memLayer.ML.confReadString("cookieName");
string devSecret = memLayer.ML.getCookieVal(cookieName);
MP-Tablet/MP-Tablet.csproj
-8
View File
@@ -420,7 +420,6 @@
<Content Include="StoricoTC.aspx" />
<Content Include="Test.aspx" />
<Content Include="Turni.aspx" />
<Content Include="ViewSwitcher.ascx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
@@ -595,13 +594,6 @@
<DependentUpon>Turni.aspx</DependentUpon>
</Compile>
<Compile Include="utility.cs" />
<Compile Include="ViewSwitcher.ascx.cs">
<DependentUpon>ViewSwitcher.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ViewSwitcher.ascx.designer.cs">
<DependentUpon>ViewSwitcher.ascx</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\Bootstrap.Master.cs">
<DependentUpon>Bootstrap.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
MP-Tablet/MappaStato.aspx.cs
+11 -9
View File
@@ -1,16 +1,18 @@
using System;
using SteamWare;
using System;
using System.Web.UI;
namespace MoonProTablet
{
public partial class MappaStato : System.Web.UI.Page
public partial class MappaStato : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
Session["TipoLink"] = "-";
}
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
Session["TipoLink"] = "-";
}
}
}
}
MP-Tablet/ODL.aspx.cs
+1
View File
@@ -70,6 +70,7 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
checkAll();
}
}
MP-Tablet/RepProd_GG.aspx.cs
+10 -6
View File
@@ -1,12 +1,16 @@
using System;
using SteamWare;
using System;
namespace MoonProTablet
{
public partial class RepProd_GG : System.Web.UI.Page
public partial class RepProd_GG : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
}
}
}
MP-Tablet/Scripts/WebForms/WebParts.js
+1 -1
View File
@@ -35,7 +35,7 @@ function WebPart(webPartElement, webPartTitleElement, zone, zoneIndex, allowZone
this.allowZoneChange = allowZoneChange;
this.zone = zone;
this.zoneIndex = zoneIndex;
this.title = ((typeof(webPartTitleElement) != "undefined") && (webPartTitleElement != null)) ?
this.Title = ((typeof(webPartTitleElement) != "undefined") && (webPartTitleElement != null)) ?
webPartTitleElement.innerText : "";
webPartElement.__webPart = this;
if ((typeof(webPartTitleElement) != "undefined") && (webPartTitleElement != null)) {
MP-Tablet/Scripts/jquery-ui-1.12.1.js
Vendored
+2 -2
View File
@@ -6908,9 +6908,9 @@ $.widget( "ui.button", {
},
_updateTooltip: function() {
this.title = this.element.attr( "title" );
this.Title = this.element.attr( "title" );
if ( !this.options.showLabel && !this.title ) {
if ( !this.options.showLabel && !this.Title = ) {
this.element.attr( "title", this.options.label );
}
},
MP-Tablet/Scripts/jquery-ui-1.12.1.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Tablet/StoricoTC.aspx.cs
+10 -6
View File
@@ -1,12 +1,16 @@
using System;
using SteamWare;
using System;
namespace MoonProTablet
{
public partial class StoricoTC : System.Web.UI.Page
public partial class StoricoTC : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
}
}
}
MP-Tablet/Test.aspx.cs
+6 -1
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,6 +12,10 @@ namespace MoonProTablet
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
}
}
}
MP-Tablet/Turni.aspx.cs
+11 -9
View File
@@ -1,16 +1,18 @@
using System;
using SteamWare;
using System;
using System.Web.UI;
namespace MoonProTablet
{
public partial class Turni : System.Web.UI.Page
public partial class Turni : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
Session["TipoLink"] = "EditMacch";
}
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
Session["TipoLink"] = "EditMacch";
}
}
}
}
MP-Tablet/ViewSwitcher.ascx
-4
View File
@@ -1,4 +0,0 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ViewSwitcher.ascx.cs" Inherits="MoonProTablet.ViewSwitcher" %>
<div id="viewSwitcher">
<%: CurrentView %> view | <a href="<%: SwitchUrl %>" data-ajax="false">Switch to <%: AlternateView %></a>
</div>
MP-Tablet/ViewSwitcher.ascx.cs
-39
View File
@@ -1,39 +0,0 @@
using Microsoft.AspNet.FriendlyUrls.Resolvers;
using System;
using System.Web;
using System.Web.Routing;
namespace MoonProTablet
{
public partial class ViewSwitcher : System.Web.UI.UserControl
{
protected string CurrentView { get; private set; }
protected string AlternateView { get; private set; }
protected string SwitchUrl { get; private set; }
protected void Page_Load(object sender, EventArgs e)
{
// Determine current view
var isMobile = WebFormsFriendlyUrlResolver.IsMobileView(new HttpContextWrapper(Context));
CurrentView = isMobile ? "Mobile" : "Desktop";
// Determine alternate view
AlternateView = isMobile ? "Desktop" : "Mobile";
// Create switch URL from the route, e.g. ~/__FriendlyUrls_SwitchView/Mobile?ReturnUrl=/Page
var switchViewRouteName = "AspNet.FriendlyUrls.SwitchView";
var switchViewRoute = RouteTable.Routes[switchViewRouteName];
if (switchViewRoute == null)
{
// Friendly URLs is not enabled or the name of the switch view route is out of sync
this.Visible = false;
return;
}
var url = GetRouteUrl(switchViewRouteName, new { view = AlternateView, __FriendlyUrls_SwitchViews = true });
url += "?ReturnUrl=" + HttpUtility.UrlEncode(Request.RawUrl);
SwitchUrl = url;
}
}
}
MP-Tablet/ViewSwitcher.ascx.designer.cs
Generated
-16
View File
@@ -1,16 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MoonProTablet
{
public partial class ViewSwitcher {
}
}
MP-Tablet/WebMasterPages/Bootstrap.Master
+1 -3
View File
@@ -13,7 +13,7 @@
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - MPTAB</title>
<title>MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
@@ -21,8 +21,6 @@
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
MP-Tablet/WebMasterPages/Bootstrap.Master.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master
+1 -1
View File
@@ -12,7 +12,7 @@
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - MAPO TAB</title>
<title>MPTAB: <%: Page.Title %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
MP-Tablet/WebMasterPages/BootstrapNoUpdPnl.Master.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
MP-Tablet/fixODL.aspx.cs
+1
View File
@@ -15,6 +15,7 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
fixBtnImpostaODL();
DateTime adesso = DateTime.Now;
hfDataTo.Value = adesso.ToString();
MP-Tablet/regNewDevice.aspx.cs
+10 -5
View File
@@ -1,11 +1,16 @@
using System;
using SteamWare;
using System;
namespace MoonProTablet
{
public partial class regNewDevice : System.Web.UI.Page
public partial class regNewDevice : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
}
if (!Page.IsPostBack)
{
this.Title = devicesAuthProxy.getPage(Request.Url);
}
}
}
}