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

iniziato fix area A3 (timbratrice da cell), NO E' ANCORA OK!!!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-11-09 18:22:02 +01:00
parent 483ea7a565
commit 35a9fc21ff
4 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW/WebMasterPages/JQMob.Master
-14
View File
@@ -37,20 +37,6 @@
<form id="form1" runat="server">
<%--aggiunto 2014.10.15 x inserire report inline...--%>
<asp:ScriptManager ID="ScriptManager1" runat="server"></asp:ScriptManager>
<%--<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
</Scripts>
</asp:ScriptManager>--%>
<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">
GPW/WebMasterPages/JQMob.Master.designer.cs
Generated
+18
View File
@@ -21,6 +21,24 @@ namespace WebSCR {
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// head control.
/// </summary>
GPW/WebMasterPages/jQueryMobile.Master
+41 -31
View File
@@ -2,29 +2,37 @@
<%@ Register Src="~/WebUserControls/mod_title.ascx" TagName="mod_title" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc2" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html>
<html lang="it">
<head id="Head1" runat="server">
<meta name="viewport" content="width=device-width, initial-scale=1">
<head runat="server">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="WebSCR site" />
<meta name="author" content="Steamware" />
<title>
<asp:ContentPlaceHolder ID="TitleContent" runat="server" />
<asp:ContentPlaceHolder ID="TitleContent" runat="server"><%: Page.Title %> - GPW</asp:ContentPlaceHolder>
</title>
<%
if (GPW.utility.EnableCdnJQ)
{
%>
<%--link CDN--%>
<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-3.1.1.min.js"></script>
<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.mobile/1.4.5/jquery.mobile-1.4.5.min.js"></script>
<link type="text/css" rel="stylesheet" href="http://ajax.aspnetcdn.com/ajax/jquery.mobile/1.4.5/jquery.mobile-1.4.5.min.css" />
<% }
else
{%>
<%--link librerie locali--%>
<link rel="stylesheet" type="text/css" href="../Content/jquery.mobile-1.4.5.min.css" />
<script type="text/javascript" src="../Scripts/jquery-3.1.1.min.js"></script>
<script type="text/javascript" src="../Scripts/jquery.mobile-1.4.5.min.js"></script>
<%} %>
<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" />
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
<%: Scripts.Render("~/bundles/jquerymobile") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<%--DA VERIFICARE QUESTI in inclusione...--%>
<link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
<link href="../Content/StyleCustom.css" rel="stylesheet" type="text/css" />
<%--<script type="text/javascript">
navigator.geolocation.getCurrentPosition(getLocation, unknownLocation);
@@ -40,18 +48,20 @@
</head>
<body>
<form id="form1" runat="server">
<div data-role="page">
<div data-role="header" data-position="fixed">
<uc1:mod_title ID="mod_title1" runat="server" />
<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" />
</div>
<div role="main" class="ui-content" style="padding: 0px;">
<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" />
</div>
</div>
</div>
<div data-role="content" style="margin: -10px;">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>
<div data-role="footer" data-position="fixed">
<uc2:mod_footer ID="mod_footer1" runat="server" />
</div>
</div>
</form>
</body>
</html>
GPW/WebMasterPages/jQueryMobile.Master.designer.cs
Generated
+27 -9
View File
@@ -12,15 +12,6 @@ namespace GPW.WebMasterPages {
public partial class jQueryMobile {
/// <summary>
/// Head1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// TitleContent control.
/// </summary>
@@ -30,6 +21,33 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder TitleContent;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// form1 control.
/// </summary>