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

portate altre pagine a nuovo template

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-11-25 12:19:07 +01:00
parent 0b07c9d118
commit de1ae58e10
26 changed files with 148 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/AnagTipoRisorsa.aspx
+21 -4
View File
@@ -1,5 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" CodeBehind="AnagTipoRisorsa.aspx.cs" Inherits="GIM_site.AnagTipoRisorsa" %>
<%@ Register src="~/WebUserControls/mod_tipoRisorsa.ascx" tagname="mod_tipoRisorsa" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_tipoRisorsa ID="mod_tipoRisorsa1" runat="server" />
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="AnagTipoRisorsa.aspx.cs" Inherits="GIM_site.AnagTipoRisorsa" %>
<%@ Register Src="~/WebUserControls/mod_tipoRisorsa.ascx" TagName="mod_tipoRisorsa" TagPrefix="uc1" %>
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" 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("AnagTipoRisorsaLong") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_tipoRisorsa ID="mod_tipoRisorsa1" runat="server" />
</div>
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/AnagTipoRisorsa.aspx.cs
+2 -1
View File
@@ -4,10 +4,11 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
namespace GIM_site
{
public partial class AnagTipoRisorsa : System.Web.UI.Page
public partial class AnagTipoRisorsa : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
Projects/WebGIM/GIM_site/Content/Style.css
+4
View File
@@ -102,6 +102,10 @@
color: #F90;
/*margin: -5px;*/
}
.navbar-right {
float: right!important;
margin-right: 0;
}
/*------------------------------------------------------------------
[ Subnavbar / .subnavbar ]
*/
Projects/WebGIM/GIM_site/Content/Style.less
+5
View File
@@ -125,6 +125,11 @@
/*margin: -5px;*/
}
.navbar-right {
float: right!important;
margin-right: 0;
}
/*------------------------------------------------------------------
[ Subnavbar / .subnavbar ]
*/
Projects/WebGIM/GIM_site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx
+1 -1
View File
@@ -66,7 +66,7 @@
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
</div>
<div class="navbar-right">
stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %>
<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>
Projects/WebGIM/GIM_site/WebUserControls/mod_testata.ascx.designer.cs
Generated
+9
View File
@@ -92,5 +92,14 @@ namespace GIM_site.WebUserControls {
/// 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;
}
}
Projects/WebGIM/GIM_site/anagAmbitiGuasto.aspx
-3
View File
@@ -2,8 +2,6 @@
<%@ Register Src="~/WebUserControls/mod_anagAmbitiGuasto.ascx" TagName="mod_anagAmbitiGuasto" TagPrefix="uc1" %>
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
@@ -22,4 +20,3 @@
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/aperturaImpianti.aspx
+17 -2
View File
@@ -1,8 +1,23 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="aperturaImpianti" Codebehind="aperturaImpianti.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="aperturaImpianti" Codebehind="aperturaImpianti.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_aperturaImpianti.ascx" tagname="mod_aperturaImpianti" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" 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("AnagAperturaSettLong") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_aperturaImpianti ID="mod_aperturaImpianti1" runat="server" />
</div>
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/aperturaImpianti.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 aperturaImpianti : System.Web.UI.Page
public partial class aperturaImpianti : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
Projects/WebGIM/GIM_site/aperturaImpianti.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.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.aspx
+19 -5
View File
@@ -1,9 +1,23 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="assegnazioniMacchineImpianti" Codebehind="assegnazioniMacchineImpianti.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="assegnazioniMacchineImpianti" CodeBehind="assegnazioniMacchineImpianti.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_assegnazioniMacchineImpianti.ascx" tagname="mod_assegnazioniMacchineImpianti" tagprefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_assegnazioniMacchineImpianti.ascx" TagName="mod_assegnazioniMacchineImpianti" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<uc1:mod_assegnazioniMacchineImpianti ID="mod_assegnazioniMacchineImpianti1"
runat="server" />
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" 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("AssegnMaccImpLong") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_assegnazioniMacchineImpianti ID="mod_assegnazioniMacchineImpianti1" runat="server" />
</div>
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.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 assegnazioniMacchineImpianti : System.Web.UI.Page
public partial class assegnazioniMacchineImpianti : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
Projects/WebGIM/GIM_site/assegnazioniMacchineImpianti.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.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/calendChiusura.aspx
+22 -6
View File
@@ -1,11 +1,27 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="calendChiusura" Codebehind="calendChiusura.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="calendChiusura" CodeBehind="calendChiusura.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_calChiusura.ascx" tagname="mod_calChiusura" tagprefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_calChiusura.ascx" TagName="mod_calChiusura" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
<uc1:mod_calChiusura ID="mod_calChiusura1" runat="server" />
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" 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("AnagCalChiusureLong") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
<uc1:mod_calChiusura ID="mod_calChiusura1" runat="server" />
</div>
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/calendChiusura.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 calendChiusura : System.Web.UI.Page
public partial class calendChiusura : UserPage
{
protected void Page_Load(object sender, EventArgs e)
{
Projects/WebGIM/GIM_site/calendChiusura.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.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
Projects/WebGIM/GIM_site/chLang.aspx
+22 -10
View File
@@ -1,13 +1,25 @@
<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MasterAjax.master" AutoEventWireup="true"
Inherits="chLang" Title="Untitled Page" Codebehind="chLang.aspx.cs" %>
<%@ Page Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" Inherits="chLang" Title="Untitled Page" CodeBehind="chLang.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_chLang.ascx" TagName="mod_chLang" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<table class="bodyCenter">
<tr>
<td>
<uc1:mod_chLang ID="Mod_chLang1" runat="server" />
</td>
</tr>
</table>
<asp:Content ID="Content2" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" 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("chLangLong") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_chLang ID="Mod_chLang1" runat="server" />
</div>
</div>
</div>
</asp:Content>
Projects/WebGIM/GIM_site/chLang.aspx.cs
+2 -1
View File
@@ -8,7 +8,8 @@ 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 chLang : System.Web.UI.Page
public partial class chLang : UserPage
{
}
Projects/WebGIM/GIM_site/chLang.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.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
+13 -7
View File
@@ -70,12 +70,6 @@ exec voc.stp_insNewLemma 'WebGIM', 'WebGIM'
exec voc.stp_insNewLemma 'QuickShortcut', 'Quick Shortcut'
exec voc.stp_insNewLemma 'GIM_LongWelcome', 'Puoi utilizzare le voci del menù in testata per accedere alle funzioni che ti sono abilitate. I link rapidi alle funzionalità più frequenti sono indicate di seguito. Per ulteriori informazioni sull''impiego clicca sulla voce "Help e supporto"'
exec voc.stp_insNewLemma 'MtzProg', 'Manut. Progr.'
UPDATE vocabolario SET traduzione = 'Anagrafiche' WHERE lemma = 'AnagraficheBase' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventions' WHERE lemma = 'RicManArea' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventi' WHERE lemma = 'RicManArea' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'Admin', 'Admin'
exec voc.stp_insNewLemma 'AreaMtz', 'Manutenzione'
UPDATE vocabolario SET traduzione = 'Maintenance' WHERE lemma = 'AreaMtz' AND Lingua = 'EN'
@@ -94,7 +88,7 @@ exec voc.stp_insNewLemma'HelpIcon', 'fa fa-info'
exec voc.stp_insNewLemma'RicManAreaIcon', 'fa fa-medkit'
exec voc.stp_insNewLemma'AnagraficheBaseIcon', 'fa fa-list-ol'
exec voc.stp_insNewLemma'AnagAmbitiGuastoIcon', 'fa fa-asterisk'
exec voc.stp_insNewLemma'AnagAperturaSettIcon', 'fa fa-calendar-check-o'
exec voc.stp_insNewLemma'AnagAperturaSettIcon', 'fa fa-calendar-plus-o'
exec voc.stp_insNewLemma'AssegnMaccImpIcon', 'fa fa-arrows-h'
exec voc.stp_insNewLemma'AnagCalChiusureIcon', 'fa fa-calendar-minus-o'
exec voc.stp_insNewLemma'GestioneCausaliIcon', 'fa fa-anchor'
@@ -112,7 +106,19 @@ exec voc.stp_insNewLemma'EditRicManIcon', 'fa fa-pencil'
exec voc.stp_insNewLemma'reportInterattivoIcon', 'fa fa-star'
exec voc.stp_insNewLemma 'GestOperMtzIcon', 'fa fa-user'
UPDATE vocabolario SET traduzione = 'Anagrafiche' WHERE lemma = 'AnagraficheBase' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventions' WHERE lemma = 'RicManArea' AND Lingua = 'IT'
UPDATE vocabolario SET traduzione = 'Interventi' WHERE lemma = 'RicManArea' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'Admin', 'Admin'
exec voc.stp_insNewLemma 'AreaMtz', 'Manutenzione'
UPDATE vocabolario SET traduzione = 'Maintenance' WHERE lemma = 'AreaMtz' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'menu', 'MENU'
exec voc.stp_insNewLemma 'menuIcon', 'fa fa-refresh'
exec voc.stp_insNewLemma 'AnagTagsLong', 'Gestione etichette associazione macchine-ricambi'
exec voc.stp_insNewLemma 'btnHideInsPeriodo', 'Nascondi inserimento periodo fermata'
UPDATE vocabolario SET traduzione = 'Hide insert stop period' WHERE lemma = 'btnHideInsPeriodo' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'scegliLingua', 'Scegli Lingua'
UPDATE vocabolario SET traduzione = 'Select Language' WHERE lemma = 'scegliLingua' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'chLangLong', 'Seleziona Lingua'
UPDATE vocabolario SET traduzione = 'Language Selection' WHERE lemma = 'chLangLong' AND Lingua = 'EN'