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

Fix master x area A2...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-11-09 17:14:12 +01:00
parent 23378df3d0
commit e35d586aac
3 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW/WebMasterPages/AjaxSimpleFull.Master
+2 -1
View File
@@ -6,7 +6,8 @@
<!DOCTYPE html>
<html lang="it">
<head id="Head1" runat="server"> <meta charset="utf-8" />
<head id="Head1" runat="server">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%: Page.Title %> - GPW</title>
<asp:PlaceHolder runat="server">
GPW/WebMasterPages/AjaxSimpleFullBCode.Master
+29 -47
View File
@@ -2,21 +2,37 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register src="../WebUserControls/mod_menuBottomFullBCode.ascx" tagname="mod_menuBottomFullBCode" tagprefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="it">
<head id="Head1" runat="server">
<title>GPW</title>
<link href="../css/Style.css" rel="stylesheet" type="text/css" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
<!DOCTYPE html>
<html lang="it">
<head id="Head1" runat="server">
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%: Page.Title %> - GPW</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<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" />
<%--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.ui/1.9.0/jquery-ui.min.js"></script>--%>
<%--link librerie locali--%>
<script src="../Scripts/jquery-3.1.1.min.js" type="text/javascript"></script>
<script src="../Scripts/jquery-ui-1.12.1.min.js" type="text/javascript"></script>
<link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.12.1.custom.min.css" rel="stylesheet" type="text/css" />
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
<%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%>
</asp:PlaceHolder>
<%--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 language="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
@@ -37,43 +53,9 @@
});
});
</script>
<%--<script type="text/javascript">
$(document).ready(function () {
// Create two variable with the names of the months and days in an array
var monthNames = ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"];
var dayNames = ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"]
// Create a newDate() object
var newDate = new Date();
// Extract the current date from Date object
newDate.setDate(newDate.getDate());
// Output the day, date, month and year
$('#Date').html(dayNames[newDate.getDay()] + " " + newDate.getDate() + ' ' + monthNames[newDate.getMonth()] + ' ' + newDate.getFullYear());
setInterval(function () {
// Create a newDate() object and extract the seconds of the current time on the visitor's
var currDate = new Date();
var seconds = currDate.getSeconds();
var minutes = currDate.getMinutes();
var hours = currDate.getHours();
// Add a leading zero to seconds value
$("#sec").html((seconds < 10 ? "0" : "") + seconds);
$("#min").html((minutes < 10 ? "0" : "") + minutes);
$("#hours").html((hours < 10 ? "0" : "") + hours);
$('#Date').html(dayNames[currDate.getDay()] + " " + currDate.getDate() + ' ' + monthNames[currDate.getMonth()] + ' ' + currDate.getFullYear());
}, 500);
});
</script>--%>
</head>
<body class="body">
<form id="form1" runat="server">
<%--<asp:ToolkitScriptManager ID="tsm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
EnableScriptLocalization="true" EnableCdn="false">
</asp:ToolkitScriptManager>--%>
<%--<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true"
EnableCdn='<%# GPW.utility.EnableCdnAjax %>'>
</asp:ScriptManager>--%>
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true"
EnableCdn="false">
</asp:ScriptManager>
GPW/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs
Generated
+27
View File
@@ -21,6 +21,33 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <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>
/// 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>
/// form1 control.
/// </summary>