Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completato primo livello fix A3...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-11-10 09:48:53 +01:00
parent b18d9e0ac2
commit 14d1f43055
10 changed files with 27 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW/A3/Admin.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="../WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="Admin.aspx.cs" Inherits="GPW.A3.Admin" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="Admin.aspx.cs" Inherits="GPW.A3.Admin" %>
<%@ Register Src="../WebUserControls/mod_resetUserAuthKey.ascx" TagName="mod_resetUserAuthKey" TagPrefix="uc1" %>
<%@ Register Src="../WebUserControls/mod_sendAuthToEmail.ascx" TagName="mod_sendAuthToEmail" TagPrefix="uc2" %>
GPW/A3/Progetti.aspx
+1 -2
View File
@@ -1,5 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="Progetti.aspx.cs"
Inherits="GPW.A3.Progetti" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="Progetti.aspx.cs" Inherits="GPW.A3.Progetti" %>
<%@ Register Src="../WebUserControls/mod_commAttivita.ascx" TagName="mod_commAttivita" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
GPW/A3/Test.aspx
-6
View File
@@ -1,6 +0,0 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/JQMob.Master" AutoEventWireup="true" CodeBehind="Test.aspx.cs" Inherits="GPW.A3.Test" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
test
</asp:Content>
GPW/A3/Test.aspx.cs
-17
View File
@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GPW.A3
{
public partial class Test : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
GPW/A3/Test.aspx.designer.cs
Generated
-17
View File
@@ -1,17 +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 GPW.A3
{
public partial class Test
{
}
}
GPW/A3/attivitaIns.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" AutoEventWireup="true" CodeBehind="attivitaIns.aspx.cs" Inherits="GPW.A3.attivitaIns" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobile.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="attivitaIns.aspx.cs" Inherits="GPW.A3.attivitaIns" %>
<%@ Register src="../WebUserControls/mod_attivitaIns.ascx" tagname="mod_attivitaIns" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
</asp:Content>
GPW/A3/regNewDevice.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobileNoCookie.Master" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="GPW.A3.regNewDevice" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/jQueryMobileNoCookie.Master" Culture="it-IT" AutoEventWireup="true" CodeBehind="regNewDevice.aspx.cs" Inherits="GPW.A3.regNewDevice" %>
<%@ Register Src="../WebUserControls/mod_regNewDevice.ascx" TagName="mod_regNewDevice" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
GPW/GPW.csproj
+6 -10
View File
@@ -143,7 +143,6 @@
<Content Include="A3\mancataTimbr.aspx" />
<Content Include="A3\Progetti.aspx" />
<Content Include="A3\regNewDevice.aspx" />
<Content Include="A3\Test.aspx" />
<Content Include="A3\Timbrature.aspx" />
<Content Include="A4\attivita.aspx" />
<Content Include="A4\attivitaIns.aspx" />
@@ -650,8 +649,12 @@
<Content Include="Services\WS_data.asmx" />
<Content Include="Site.Master" />
<Content Include="ViewSwitcher.ascx" />
<Content Include="Web.config" />
<Content Include="Bundle.config" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Bundle.config">
<SubType>Designer</SubType>
</Content>
<Content Include="packages.config" />
<None Include="Project_Readme.html" />
<Content Include="Site.Mobile.Master" />
@@ -861,13 +864,6 @@
<Compile Include="A3\regNewDevice.aspx.designer.cs">
<DependentUpon>regNewDevice.aspx</DependentUpon>
</Compile>
<Compile Include="A3\Test.aspx.cs">
<DependentUpon>Test.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="A3\Test.aspx.designer.cs">
<DependentUpon>Test.aspx</DependentUpon>
</Compile>
<Compile Include="A3\Timbrature.aspx.cs">
<DependentUpon>Timbrature.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
GPW/WebMasterPages/jQueryMobile.Master
+4 -4
View File
@@ -51,14 +51,14 @@
<div id="textWrapper">
<div data-role="page" class="ui-responsive-panel" data-url="<%= Request.Url.PathAndQuery %>">
<div data-role="header" data-position="fixed" data-theme="a">
<uc1:mod_title ID="mod_title1" runat="server" />
<uc1:mod_title ID="mod_title1" runat="server" />
</div>
<div role="main" class="ui-content" style="padding: 0px;">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
<div data-role="footer" data-position="fixed" data-theme="a">
<uc2:mod_footer ID="mod_footer1" runat="server" />
<uc2:mod_footer ID="mod_footer1" runat="server" />
</div>
</div>
</div>
GPW/WebMasterPages/jQueryMobileNoCookie.Master
+13 -13
View File
@@ -2,6 +2,7 @@
Inherits="GPW.WebMasterPages.jQueryMobileNoCookie" %>
<%@ Register Src="../WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc1" %>
<!DOCTYPE html>
<html lang="it">
<head runat="server">
@@ -14,7 +15,7 @@
<asp:ContentPlaceHolder ID="TitleContent" runat="server"><%: Page.Title %> - GPW</asp:ContentPlaceHolder>
</title>
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
<link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
@@ -33,19 +34,18 @@
</head>
<body>
<form id="form1" runat="server">
<div data-role="page">
<div data-role="header" data-position="fixed">
<h1>
Registrazione Device
</h1>
<div data-role="page">
<div data-role="header" data-position="fixed">
<h1>Registrazione Device
</h1>
</div>
<div data-role="content">
<asp:ContentPlaceHolder ID="MainContent" runat="server"></asp:ContentPlaceHolder>
</div>
<div data-role="footer" data-position="fixed" data-theme="a">
<uc1:mod_footer ID="mod_footer1" runat="server" />
</div>
</div>
<div data-role="content">
<asp:ContentPlaceHolder ID="MainContent" runat="server"></asp:ContentPlaceHolder>
</div>
<div data-role="footer" class="ui-bar" data-position="fixed">
<uc1:mod_footer ID="mod_footer1" runat="server" />
</div>
</div>
</form>
</body>
</html>