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

modifica master x prime pagine

Browse Source
This commit is contained in:
Samuele Locatelli
2017-02-13 11:31:59 +01:00
parent f07ebceb59
commit 9ad0a8bcdb
19 changed files with 251 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPS/AnagraficaMappe.aspx
+14 -5
View File
@@ -1,9 +1,18 @@
<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" Codebehind="AnagraficaMappe.aspx.cs" %>
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="AnagraficaMappe" Title="Untitled Page" CodeBehind="AnagraficaMappe.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_anagraficaMappe.ascx" TagName="mod_anagraficaMappe" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<a href="AnagraficaMappe.aspx"></a>
<uc1:mod_anagraficaMappe ID="Mod_anagraficaMappe1" runat="server" />
<a href="AnagraficaMappe.aspx"></a>
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container">
<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("AnagraficaMappe") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_anagraficaMappe ID="Mod_anagraficaMappe1" runat="server" />
</div>
</div>
</div>
</asp:Content>
XPS/AnagraficaMappe.aspx.cs
+2 -1
View File
@@ -8,8 +8,9 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using SteamWare;
public partial class AnagraficaMappe : Flesk.Accelerator.Page //System.Web.UI.Page
public partial class AnagraficaMappe : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
XPS/Bootstrap.Master
+11 -11
View File
@@ -1,4 +1,4 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="GMW.Bootstrap" %>
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="XPS.Bootstrap" %>
<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %>
<!DOCTYPE html>
@@ -9,17 +9,17 @@
<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="GMW site" />
<meta name="description" content="XPS site" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>GMW - <%: Page.Title %></title>
<title>XPS - <%: Page.Title %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/bootSwitch") %>
<%: System.Web.Optimization.Scripts.Render("~/bundles/modernizr") %>
<%: System.Web.Optimization.Scripts.Render("~/bundles/jquery") %>
<%: System.Web.Optimization.Scripts.Render("~/bundles/jqueryui") %>
<%: System.Web.Optimization.Scripts.Render("~/bundles/bootSwitch") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
@@ -80,13 +80,13 @@
<asp:Label runat="server" ID="lblDateTime">
<%: DateTime.Now %></asp:Label>
|
<asp:Label runat="server" ID="lblUtente"><%: GMW_data.MagClass.magazzino.CodSoggCurrUser %></asp:Label>
<asp:Label runat="server" ID="lblUtente"><%: SteamWare.devicesAuthProxy.stObj.CognomeNome%></asp:Label>
</p>
<p class="navbar-text navbar-right" style="margin-bottom: 0px; margin-top: 0px;">
<b>GMW</b>
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b>
<asp:Label runat="server" ID="lblVers" />
|
2010-<%: DateTime.Now.Year %> &copy;
2010-<%: DateTime.Now.Year %>&copy;
<asp:Image ID="logoSW" ImageUrl="~/images/logoSteamware.png" runat="server" Height="22px" AlternateText="SteamWare" />
</p>
</div>
@@ -97,7 +97,7 @@
</form>
<script src="Scripts/bootstrap.min.js"></script>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/jSteamware") %>
<%: System.Web.Optimization.Scripts.Render("~/bundles/jSteamware") %>
</asp:PlaceHolder>
</body>
XPS/Bootstrap.Master.cs
+1
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.Optimization;
using SteamWare;
namespace XPS
XPS/Global.asax.cs
+3
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.Security;
using System.Web.SessionState;
using System.Web.Optimization;
using System.Web.Routing;
namespace XPS
@@ -13,6 +14,8 @@ namespace XPS
protected void Application_Start(object sender, EventArgs e)
{
// Code that runs on application startup
BundleConfig.RegisterBundles(BundleTable.Bundles);
// aggiungo friendlyUrls...
RouteConfig.RegisterRoutes(RouteTable.Routes);
}
XPS/Properties/AssemblyInfo.cs
+4 -4
View File
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("XPS")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
//[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("XPS")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
//[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]
XPS/WebUserControls/mod_testata.ascx
+30 -11
View File
@@ -1,5 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="XPS.WebUserControls.mod_testata" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<div class="noShadows">
<div class="navbar-header">
@@ -7,22 +12,28 @@
<li class='navbarSep'>
<asp:HyperLink runat="server" ID="hlHome" NavigateUrl="~/" CssClass="navbar-brand" ToolTip='<%# SteamWare.memLayer.ML.confReadString("titleApp") %>'> <i class="fa fa-home fa-lg"></i></asp:HyperLink>
</li>
<li class="navbarSep">
<asp:HyperLink runat="server" ID="hlUser" CssClass="navbar-brand" ToolTip='<%# usrAuthToolTip %>'>
<i class="fa fa-user fa-lg <%: usrAuthCss %>"></i>
<asp:Label runat="server" ID="lblMatr" Text='<%# usrAuthText %>' />
</asp:HyperLink></li><li>
<li class="active">
<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update">
<%: nomePag %>
<i class="fa-lg <%: cssIconPag %>"></i>
</asp:LinkButton></li></ul><div class="nav navbar-nav navbar-right">
</asp:LinkButton></li>
<li>
<asp:LinkButton runat="server" ID="lbnUpdate2">
</asp:LinkButton>
</li>
</ul>
<div class="nav navbar-nav navbar-right">
<button type="button" class="navbar-toggle navbar-right" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button></div></div><div class="navbar-collapse collapse">
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
</button>
</div>
</div>
<div class="navbar-collapse collapse">
<ul id="itemPlaceholderContainer" runat="server" class="nav navbar-nav navbar-right">
<asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
<ItemTemplate>
<li class="dropdown">
<a href='<%# XPath("@url").ToString().Replace("~/","") %>' class="dropdown-toggle" data-toggle="dropdown">
<a href='<%# XPath("@url")%>' class="dropdown-toggle" data-toggle="dropdown">
<i class='<%# XPath("@description")%>'></i>
<%# XPath("@title")%>
<b class="caret"></b>
@@ -44,11 +55,19 @@
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
<li>
<asp:LinkButton runat="server" ID="lbShowNumKey" CssClass="navbar-brand" OnClick="lbShowNumKey_Click" ToolTip="Mostra Num Key">&nbsp;<i class="fa fa-calculator fa-lg"></i></asp:LinkButton></li></ul><asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
<asp:TextBox ID="txtSearch" runat="server" CssClass="form-control input-sm search-query" placeholder="[S]earch" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" TextMode="Search" AccessKey="s" />
</li>
</ul>
</div>
<!--/.nav-collapse -->
<div class="subnavbar" style="color: #999;">
<div class="navbar-left">
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %></div><div class="navbar-right">
stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %></div></div></div>
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
</div>
<div class="navbar-right">
<asp:HyperLink runat="server" ID="hlLang" NavigateUrl="~/chLang"> <i class="fa fa-flag-checkered"></i> <%: string.Format("{0} - [{1}]", SteamWare.user_std.UtSn.CognomeNome, SteamWare.user_std.UtSn.lingua) %></asp:HyperLink>
</div>
</div>
</div>
XPS/WebUserControls/mod_testata.ascx.cs
+41 -13
View File
@@ -24,11 +24,11 @@ namespace XPS.WebUserControls
if (!devicesAuthProxy.stObj.isAuth)
{
string lastPage = Request.Url.LocalPath.Split('/').Last();
if (lastPage != "" && lastPage != "login.aspx")
if (lastPage != "" && lastPage != "login")
{
Session["nextPage"] = lastPage;
}
Response.Redirect("login.aspx");
Response.Redirect("login");
}
else
{
@@ -37,7 +37,6 @@ namespace XPS.WebUserControls
}
// fix componenti
hlHome.DataBind();
hlUser.DataBind();
}
}
@@ -48,7 +47,7 @@ namespace XPS.WebUserControls
string answ = "";
try
{
DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}'", devicesAuthProxy.pagCorrente))[0];
DS_Auth.PermessiRow riga = (DS_Auth.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}.aspx' OR URL = '{0}'", devicesAuthProxy.pagCorrente))[0];
answ = traduci(riga.DESCRIZIONE);
}
catch
@@ -60,10 +59,11 @@ namespace XPS.WebUserControls
{
get
{
string answ = "";
try
{
DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}'", devicesAuthProxy.pagCorrente))[0];
DS_Auth.PermessiRow riga = (DS_Auth.PermessiRow)devicesAuthProxy.stObj.permessi.Select(string.Format("URL = '{0}.aspx' OR URL = '{0}'", devicesAuthProxy.pagCorrente))[0];
answ = traduci(riga.NOME);
}
catch
@@ -80,7 +80,7 @@ namespace XPS.WebUserControls
{
if (devicesAuthProxy.stObj.mappaSito == "")
{
Response.Redirect("default.aspx");
Response.Redirect("Default");
}
XmlMenu.Data = devicesAuthProxy.stObj.mappaSito;
@@ -211,7 +211,7 @@ namespace XPS.WebUserControls
// svuoto session e cache per rileggere i dati da Db
Session.RemoveAll();
memLayer.ML.setSessionVal("nextPage", devicesAuthProxy.pagCorrente);
Response.Redirect("login.aspx");
Response.Redirect("login");
}
/// <summary>
/// click su pagina corrente, fa update!
@@ -222,13 +222,41 @@ namespace XPS.WebUserControls
{
doFullDataUpdate();
}
protected void lbShowNumKey_Click(object sender, EventArgs e)
/// <summary>
/// verifica se la pagina abbia abilitato il search
/// </summary>
public bool pageHasSearch { get; set; }
/// <summary>
/// modifica campo ricerca...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtSearch_TextChanged(object sender, EventArgs e)
{
// cambio valore boolean di visualizzazione tastiera numerica a video...
memLayer.ML.setSessionVal("showNumKey", !memLayer.ML.BoolSessionObj("showNumKey"));
// ricarico
Response.Redirect(devicesAuthProxy.pagCorrente);
// salvo in sessione
memLayer.ML.setSessionVal("valoreCercato", txtSearch.Text.Trim(), true);
// raise dell'evento
if (eh_nuovaRicerca != null)
{
eh_nuovaRicerca(this, new EventArgs());
}
}
/// <summary>
/// valore ricerca
/// </summary>
public string searchVal
{
get
{
return txtSearch.Text.Trim();
}
set
{
memLayer.ML.setSessionVal("valoreCercato", value, true);
txtSearch.Text = value;
}
}
public event EventHandler eh_nuovaRicerca;
}
}
XPS/WebUserControls/mod_testata.ascx.designer.cs
Generated
+45 -27
View File
@@ -12,6 +12,24 @@ namespace XPS.WebUserControls {
public partial class mod_testata {
/// <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>
/// hlHome control.
/// </summary>
@@ -21,24 +39,6 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.HyperLink hlHome;
/// <summary>
/// hlUser 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.HyperLink hlUser;
/// <summary>
/// lblMatr 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.Label lblMatr;
/// <summary>
/// lbnUpdate control.
/// </summary>
@@ -48,6 +48,15 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbnUpdate;
/// <summary>
/// lbnUpdate2 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.LinkButton lbnUpdate2;
/// <summary>
/// itemPlaceholderContainer control.
/// </summary>
@@ -66,15 +75,6 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater menu;
/// <summary>
/// lbShowNumKey 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.LinkButton lbShowNumKey;
/// <summary>
/// XmlMenu control.
/// </summary>
@@ -83,5 +83,23 @@ namespace XPS.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu;
/// <summary>
/// txtSearch 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.TextBox txtSearch;
/// <summary>
/// hlLang 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.HyperLink hlLang;
}
}
XPS/XPS.csproj
+29
View File
@@ -161,6 +161,18 @@
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\font.css">
<DependentUpon>font.less</DependentUpon>
</Content>
<Content Include="Content\font.min.css">
<DependentUpon>font.css</DependentUpon>
</Content>
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="Content\Style.min.css">
<DependentUpon>Style.css</DependentUpon>
</Content>
<Content Include="Content\themes\base\accordion.css" />
<Content Include="Content\themes\base\all.css" />
<Content Include="Content\themes\base\autocomplete.css" />
@@ -203,6 +215,7 @@
<Content Include="Content\themes\base\theme.css" />
<Content Include="Content\themes\base\tooltip.css" />
<Content Include="elencoCommSped.aspx" />
<Content Include="favicon.ico" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
@@ -264,6 +277,7 @@
<Content Include="images\flag-xb.png" />
<Content Include="images\header-opened.png" />
<Content Include="images\installWindows.png" />
<Content Include="images\logoSteamware.png" />
<Content Include="images\logo_sw.png" />
<Content Include="images\ModLang.png" />
<Content Include="images\ModPassw.png" />
@@ -327,6 +341,16 @@
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Bootstrap.Master" />
<Content Include="Bundle.config" />
<Content Include="bundleconfig.json" />
<Content Include="Content\bootstrap-theme.less" />
<Content Include="Content\bootstrap.less" />
<Content Include="Content\font.less" />
<Content Include="Content\Style.less" />
<None Include="compilerconfig.json" />
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
</None>
<None Include="Scripts\jquery-3.1.1.intellisense.js" />
<Content Include="Scripts\jquery-3.1.1.js" />
<Content Include="Scripts\jquery-3.1.1.min.js" />
@@ -363,6 +387,9 @@
<Content Include="WebMasterPages\Bootstrap.Master" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\VersGen.cs">
<Link>VersGen.cs</Link>
</Compile>
<Compile Include="AnagraficaEventi.aspx.cs">
<DependentUpon>AnagraficaEventi.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -384,6 +411,7 @@
<Compile Include="AnagraficaStati.aspx.designer.cs">
<DependentUpon>AnagraficaStati.aspx</DependentUpon>
</Compile>
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="barcode.aspx.cs">
<DependentUpon>barcode.aspx</DependentUpon>
@@ -1016,6 +1044,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Content\bootstrap-switch\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
XPS/menu.aspx
+14 -4
View File
@@ -1,9 +1,19 @@
<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" Codebehind="menu.aspx.cs" %>
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="menu" Title="Untitled Page" CodeBehind="menu.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_main_help.ascx" TagName="mod_main_help" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<uc2:mod_main_help ID="Mod_main_help1" runat="server" />
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container">
<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("Menu") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc2:mod_main_help ID="Mod_main_help1" runat="server" />
</div>
</div>
</div>
</asp:Content>
XPS/menu.aspx.cs
+3 -15
View File
@@ -1,19 +1,7 @@
using System;
using System.Data;
using System.Configuration;
using System.Collections;
using System.Web;
using System.Web.Security;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using SteamWare;
public partial class menu : Flesk.Accelerator.Page //System.Web.UI.Page
public partial class menu : UserPage //System.Web.UI.Page
{
protected override void OnUnload(EventArgs e)
{
base.OnUnload(e);
RemoveViewStateFiles();
}
}
XPS/update.aspx
+14 -4
View File
@@ -1,7 +1,17 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master"
AutoEventWireup="true" Inherits="update" CodeBehind="update.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="update" CodeBehind="update.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_update.ascx" TagName="mod_update" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_update ID="mod_update1" runat="server" />
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container">
<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("UpdateAnagrafiche") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_update ID="mod_update1" runat="server" />
</div>
</div>
</div>
</asp:Content>
XPS/update.aspx.cs
+2 -1
View File
@@ -3,8 +3,9 @@ using System.Collections.Generic;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
public partial class update : Flesk.Accelerator.Page //System.Web.UI.Page
public partial class update : UserPage //System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
XPS/update.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
XPS/vocabolario.aspx
+15 -4
View File
@@ -1,8 +1,19 @@
<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" Codebehind="vocabolario.aspx.cs" %>
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" Inherits="vocabolario" Title="Untitled Page" CodeBehind="vocabolario.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_vocabolario.ascx" TagName="mod_vocabolario" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_lemmiVocab.ascx" TagName="mod_lemmiVocab" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_vocabolario ID="Mod_vocabolario1" runat="server" />
<uc2:mod_lemmiVocab ID="Mod_lemmiVocab1" runat="server" />
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container">
<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("Vocabolario") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_vocabolario ID="Mod_vocabolario1" runat="server" />
<uc2:mod_lemmiVocab ID="Mod_lemmiVocab1" runat="server" />
</div>
</div>
</div>
</asp:Content>
XPS/vocabolario.aspx.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using System.Web.UI.WebControls.WebParts;
using System.Web.UI.HtmlControls;
using SteamWare;
public partial class vocabolario : Flesk.Accelerator.Page //System.Web.UI.Page
public partial class vocabolario : UserPage
{
protected override void OnInit(EventArgs e)
{
XPS/vocabolario.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
XPS_app.sln
+20
View File
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\Steamwar
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Equa_Auth", "Equa_Auth\Equa_Auth.csproj", "{BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -116,6 +118,24 @@ Global
{BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Any CPU.Build.0 = Release|Any CPU
{BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BDD58632-ED9F-46DE-ABE9-8B7E228EFA72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|.NET.ActiveCfg = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|.NET.Build.0 = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|.NET.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|.NET.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Any CPU.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Mixed Platforms.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.EQUA|Mixed Platforms.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|.NET.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|.NET.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Any CPU.Build.0 = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE