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

Completato restyle pagine collaudi e composizione collaudi...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-06-18 17:26:54 +02:00
parent 651bbd7c3b
commit b95c832a0a
16 changed files with 254 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/CMS_SC.csproj
+8
View File
@@ -396,6 +396,7 @@
<ItemGroup>
<Content Include="Scripts\jquery-2.1.4.min.map" />
<None Include="Scripts\_references.js" />
<Content Include="Site.Master" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -544,6 +545,13 @@
<DependentUpon>WS_data.asmx</DependentUpon>
<SubType>Component</SubType>
</Compile>
<Compile Include="Site.Master.cs">
<DependentUpon>Site.Master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Site.Master.designer.cs">
<DependentUpon>Site.Master</DependentUpon>
</Compile>
<Compile Include="Test.aspx.cs">
<DependentUpon>Test.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
CMS_SC/ElencoSchede.aspx
+10 -2
View File
@@ -10,10 +10,14 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid">
<div class="row">
<div class="row panel panel-default" style="margin: 4px 8px;">
<div class="panel-heading">
<div class="row" style="margin: 2px 4px;">
<h3 class="panel-title"><%: traduci("ElencoSchede") %></h3>
</div>
</div>
<div class="col-xs-4">
<uc1:mod_elencoDossiers runat="server" ID="mod_elencoDossiers" />
<uc1:mod_righePag ID="mod_righePag" runat="server" />
</div>
<div class="col-xs-8">
<div class="row" style="font-size: 0.8em;">
@@ -34,6 +38,10 @@
</div>
</div>
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag ID="mod_righePag" runat="server" />
</div>
</div>
</div>
</asp:Content>
CMS_SC/ElencoSchede.aspx.designer.cs
Generated
+9 -9
View File
@@ -21,15 +21,6 @@ namespace CMS_SC {
/// </remarks>
protected global::CMS_SC.WebUserControls.mod_elencoDossiers mod_elencoDossiers;
/// <summary>
/// mod_righePag control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_righePag mod_righePag;
/// <summary>
/// ddlSelFamMacc control.
/// </summary>
@@ -92,5 +83,14 @@ namespace CMS_SC {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::CMS_SC.WebUserControls.mod_elencoSchedeDossier mod_elencoSchedeDossier;
/// <summary>
/// mod_righePag control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_righePag mod_righePag;
}
}
CMS_SC/SchemaCollMacc.aspx
+17 -9
View File
@@ -9,16 +9,24 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="row" style="font-size: 0.9em;">
<div class="col-xs-1">
<b>
<asp:Label runat="server" ID="lblMacchina"><%: traduci("SelMacchina") %></asp:Label></b>
<div class="row panel panel-default" style="margin: 2px 4px;">
<div class="panel-heading">
<div class="row" style="margin: 2px 4px;">
<h3 class="panel-title"><%: traduci("SchemaCollMacc") %></h3>
</div>
</div>
<div class="col-xs-8">
<uc1:mod_autocompleteShort runat="server" ID="acMacchina" contextKey="m" minCharAutocomplete="2" showKey="false" ServicePath='<%# serviceUrl("Macchine") %>' placeholder="Type to search" show="true" />
</div>
<div class="col-xs-3">
<asp:Button runat="server" ID="btnAddNew" CssClass="btn btn-success" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnAddNew_Click" />
<div class="row" style="margin: 4px 4px;">
<div class="col-xs-1">
<b>
<asp:Label runat="server" ID="lblMacchina"><%: traduci("SelMacchina") %></asp:Label></b>
</div>
<div class="col-xs-8">
<uc1:mod_autocompleteShort runat="server" ID="acMacchina" contextKey="m" minCharAutocomplete="2" showKey="false" ServicePath='<%# serviceUrl("Macchine") %>' placeholder="Type to search" show="true" />
</div>
<div class="col-xs-3">
<asp:Button runat="server" ID="btnAddNew" CssClass="btn btn-success" Text='<%# traduci("btnAddNewFromEmpty") %>' OnClick="btnAddNew_Click" />
</div>
</div>
</div>
</div>
</asp:Content>
CMS_SC/Site.Master
+89
View File
@@ -0,0 +1,89 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="CMS_SC.SiteMaster" %>
<!DOCTYPE html>
<html lang="en">
<head runat="server">
<meta charset="utf-8" />
<title><%: Page.Title %> - My ASP.NET Application</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<meta name="viewport" content="width=device-width" />
<asp:ContentPlaceHolder runat="server" ID="HeadContent" />
</head>
<body>
<form runat="server">
<asp:ScriptManager runat="server">
<Scripts>
<%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="jquery" />
<asp:ScriptReference Name="jquery.ui.combined" />
<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" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<header>
<div class="content-wrapper">
<div class="float-left">
<p class="site-title">
<a runat="server" href="~/">your logo here</a>
</p>
</div>
<div class="float-right">
<section id="login">
<asp:LoginView runat="server" ViewStateMode="Disabled">
<AnonymousTemplate>
<ul>
<li><a id="registerLink" runat="server" href="~/Account/Register">Register</a></li>
<li><a id="loginLink" runat="server" href="~/Account/Login">Log in</a></li>
</ul>
</AnonymousTemplate>
<LoggedInTemplate>
<p>
Hello, <a runat="server" class="username" href="~/Account/Manage" title="Manage your account">
<asp:LoginName runat="server" CssClass="username" /></a>!
<asp:LoginStatus runat="server" LogoutAction="Redirect" LogoutText="Log off" LogoutPageUrl="~/" />
</p>
</LoggedInTemplate>
</asp:LoginView>
</section>
<nav>
<ul id="menu">
<li><a runat="server" href="~/">Home</a></li>
<li><a runat="server" href="~/About">About</a></li>
<li><a runat="server" href="~/Contact">Contact</a></li>
</ul>
</nav>
</div>
</div>
</header>
<div id="body">
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent" />
<section class="content-wrapper main-content clear-fix">
<asp:ContentPlaceHolder runat="server" ID="MainContent" />
</section>
</div>
<footer>
<div class="content-wrapper">
<div class="float-left">
<p>&copy; <%: DateTime.Now.Year %> - My ASP.NET Application</p>
</div>
</div>
</footer>
</form>
</body>
</html>
CMS_SC/Site.Master.cs
+73
View File
@@ -0,0 +1,73 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace CMS_SC
{
public partial class SiteMaster : MasterPage
{
private const string AntiXsrfTokenKey = "__AntiXsrfToken";
private const string AntiXsrfUserNameKey = "__AntiXsrfUserName";
private string _antiXsrfTokenValue;
protected void Page_Init(object sender, EventArgs e)
{
// The code below helps to protect against XSRF attacks
var requestCookie = Request.Cookies[AntiXsrfTokenKey];
Guid requestCookieGuidValue;
if (requestCookie != null && Guid.TryParse(requestCookie.Value, out requestCookieGuidValue))
{
// Use the Anti-XSRF token from the cookie
_antiXsrfTokenValue = requestCookie.Value;
Page.ViewStateUserKey = _antiXsrfTokenValue;
}
else
{
// Generate a new Anti-XSRF token and save to the cookie
_antiXsrfTokenValue = Guid.NewGuid().ToString("N");
Page.ViewStateUserKey = _antiXsrfTokenValue;
var responseCookie = new HttpCookie(AntiXsrfTokenKey)
{
HttpOnly = true,
Value = _antiXsrfTokenValue
};
if (FormsAuthentication.RequireSSL && Request.IsSecureConnection)
{
responseCookie.Secure = true;
}
Response.Cookies.Set(responseCookie);
}
Page.PreLoad += master_Page_PreLoad;
}
protected void master_Page_PreLoad(object sender, EventArgs e)
{
if (!IsPostBack)
{
// Set Anti-XSRF token
ViewState[AntiXsrfTokenKey] = Page.ViewStateUserKey;
ViewState[AntiXsrfUserNameKey] = Context.User.Identity.Name ?? String.Empty;
}
else
{
// Validate the Anti-XSRF token
if ((string)ViewState[AntiXsrfTokenKey] != _antiXsrfTokenValue
|| (string)ViewState[AntiXsrfUserNameKey] != (Context.User.Identity.Name ?? String.Empty))
{
throw new InvalidOperationException("Validation of Anti-XSRF token failed.");
}
}
}
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
CMS_SC/Site.Master.designer.cs
Generated
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <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 CMS_SC
{
public partial class SiteMaster
{
/// <summary>
/// HeadContent 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.ContentPlaceHolder HeadContent;
/// <summary>
/// FeaturedContent 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.ContentPlaceHolder FeaturedContent;
/// <summary>
/// MainContent 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.ContentPlaceHolder MainContent;
}
}
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/CMS_SC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.047.337")]
[assembly: AssemblyFileVersion("1.6.047.337")]
[assembly: AssemblyVersion("1.6.049.337")]
[assembly: AssemblyFileVersion("1.6.049.337")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/CMS_SC.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.047.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.6.047.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.6.049.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.6.049.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.