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

Fix grafici vari

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-11-25 16:51:11 +01:00
parent 40369ba832
commit 282646cd9f
20 changed files with 60 additions and 94 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/Content/Style.css
+1 -1
View File
@@ -103,7 +103,7 @@
/*margin: -5px;*/
}
.navbar-right {
float: right!important;
float: right !important;
margin-right: 0;
}
/*------------------------------------------------------------------
Projects/WebGIM/GIM_site/Content/Style.less
+6 -3
View File
@@ -28,9 +28,10 @@
color: #5f2121;
}
.pad_1e{
.pad_1e {
padding: 1em;
}
.divNumKeyb {
float: right;
/*margin: 2px;*/
@@ -41,7 +42,8 @@
min-width: 100px;
min-height: 280px;
}
.NumKeyBtn{
.NumKeyBtn {
min-height: 3.5em;
}
@@ -119,6 +121,7 @@
color: #FFF;
/*margin: -5px;*/
}
.navbar-inverse .navbar-nav > .active > a:hover {
background: transparent;
color: #F90;
@@ -126,7 +129,7 @@
}
.navbar-right {
float: right!important;
float: right !important;
margin-right: 0;
}
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_calChiusura.ascx
+1 -1
View File
@@ -44,7 +44,7 @@
<asp:Label ID="Label2" runat="server" Text='<%# Eval("data","{0:yyyy/MM/dd}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="descrizione" SortExpression="descrizione">
<asp:TemplateField HeaderText="Descrizione" SortExpression="descrizione">
<EditItemTemplate>
<asp:TextBox ID="TextBox1" runat="server" Width="30em" Text='<%# Bind("descrizione") %>' />
</EditItemTemplate>
Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx
+34 -28
View File
@@ -1,28 +1,34 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_chLang" Codebehind="mod_chLang.ascx.cs" %>
<link href="Style.css" rel="stylesheet" type="text/css" />
<table id="table1" runat="server" cellspacing="1" cellpadding="1" class="centerMenu">
<tr class="ctrHeaderPager">
<td>
<asp:Label id="lblScegli" runat="server" ></asp:Label>
</td>
</tr>
<tr>
<td>
<asp:DataList id="dataListLingue" runat="server" DataKeyField="Lingua" DataSourceid="ods_lingueApp" Width="100%" OnSelectedIndexChanged="dataListLingue_SelectedIndexChanged">
<ItemStyle CssClass="ctrRowStyle" />
<AlternatingItemStyle CssClass="ctrAltRowStyle" />
<ItemTemplate>
<asp:LinkButton id="Linkbutton1" runat="server" name="Linkbutton1" CausesValidation="false" CommandName="Select">
<img alt='<%# DataBinder.Eval(Container, "DataItem.Lingua") %>' src='./images/flag-<%# DataBinder.Eval(Container, "DataItem.Lingua") %>.png' />
<asp:Label id="LinguaLabel" runat="server" Text='<%# formattaLingua(Eval("Lingua"),Eval("DescrizioneLingua")) %>' Width="250px"/>
<img alt='<%# DataBinder.Eval(Container, "DataItem.Lingua") %>' src='./images/flag-<%# DataBinder.Eval(Container, "DataItem.Lingua") %>.png' />
</asp:LinkButton>
</ItemTemplate>
</asp:DataList>
<asp:ObjectDataSource id="ods_lingueApp" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetLingue" TypeName="selData">
</asp:ObjectDataSource>
</td>
</tr>
</table>
<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_chLang" CodeBehind="mod_chLang.ascx.cs" %>
<div class="row">
<div class="col-xs-offset-3 col-xs-6">
<div class="ctrHeaderPager">
<asp:Label ID="lblScegli" runat="server"></asp:Label>
</div>
</div>
</div>
<asp:DataList ID="dataListLingue" runat="server" DataKeyField="Lingua" DataSourceID="ods_lingueApp" Width="100%" OnSelectedIndexChanged="dataListLingue_SelectedIndexChanged">
<ItemStyle CssClass="ctrRowStyle" />
<AlternatingItemStyle CssClass="ctrAltRowStyle" />
<ItemTemplate>
<div class="row text-center">
<asp:LinkButton ID="Linkbutton1" runat="server" name="Linkbutton1" CausesValidation="false" CommandName="Select">
<div class="col-xs-offset-4 col-xs-1">
<img alt='<%# DataBinder.Eval(Container, "DataItem.Lingua") %>' src='./images/flag-<%# DataBinder.Eval(Container, "DataItem.Lingua") %>.png' />
</div>
<div class="col-xs-2">
<asp:Label ID="LinguaLabel" runat="server" Text='<%# formattaLingua(Eval("Lingua"),Eval("DescrizioneLingua")) %>' />
</div>
<div class="col-xs-1">
<img alt='<%# DataBinder.Eval(Container, "DataItem.Lingua") %>' src='./images/flag-<%# DataBinder.Eval(Container, "DataItem.Lingua") %>.png' />
</div>
</asp:LinkButton>
</div>
</ItemTemplate>
</asp:DataList>
<asp:ObjectDataSource ID="ods_lingueApp" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="GetLingue" TypeName="selData"></asp:ObjectDataSource>
</div>
Projects/WebGIM/GIM_site/WebUserControls/mod_chLang.ascx.designer.cs
Generated
+1 -11
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>
//------------------------------------------------------------------------------
@@ -12,15 +11,6 @@
public partial class mod_chLang {
/// <summary>
/// table1 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.HtmlTable table1;
/// <summary>
/// lblScegli control.
/// </summary>
Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx
+1 -1
View File
@@ -108,7 +108,7 @@
<asp:Label ID="Label4" runat="server" Text='<%# Eval("codMacchina","({0})") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="descrizione" SortExpression="descrizione">
<asp:TemplateField HeaderText="Descrizione" SortExpression="descrizione">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# trimmaTesto(Eval("descrizione"),50) %>'
ToolTip='<%# Eval("descrizione") %>' />
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+1 -1
View File
@@ -36,7 +36,7 @@
<asp:Label ID="Label4" runat="server" Text='<%# Eval("nomeMacchina") %>' /></b>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
<asp:BoundField DataField="descrizione" HeaderText="Descrizione" SortExpression="descrizione" />
<asp:BoundField DataField="descrPriorita" HeaderText="descrPriorita" SortExpression="descrPriorita" />
<asp:CheckBoxField DataField="isFermo" HeaderText="chkImpFermo" SortExpression="isFermo" />
<asp:BoundField DataField="descrTipo" HeaderText="descrTipo" SortExpression="descrTipo" />
Projects/WebGIM/GIM_site/WebUserControls/mod_reportInterventi.ascx
+1 -1
View File
@@ -72,7 +72,7 @@
</div>
</div>
</div>
<div style="font-size: 8pt; clear: both; text-align: center; vertical-align: top; padding: 20px 2px; background-color: #E5E2E1; height: 180px;">
<div style="font-size: 8pt; clear: both; text-align: center; vertical-align: top; padding: 20px 2px; background-color: #E5E2E1; height: 00px;">
<div style="border: 1px solid gray; float: left; height: 180px;">
<div style="clear: both; height: 160px;">
<div style="float: left; width: 250px; margin: -10px 10px -2px 10px;">
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/elencoRichieste.aspx
+1 -1
View File
@@ -10,7 +10,7 @@
<asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
<div class="container">
<div class="container-flow">
<div class="row panel panel-default" style="margin: 4px 8px;">
<div class="panel-heading">
<div class="row" style="margin: 2px 4px;">
Projects/WebGIM/GIM_site/forceUser.aspx
+4 -4
View File
@@ -1,5 +1,5 @@
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true"
Inherits="forceUser" Title="Untitled Page" Codebehind="forceUser.aspx.cs" %>
Inherits="forceUser" Title="Untitled Page" CodeBehind="forceUser.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_login.ascx" TagName="mod_login" TagPrefix="uc1" %>
@@ -19,9 +19,9 @@
</div>
</div>
<div class="col-xs-12">
<div class="centerAll">
<uc1:mod_login ID="Mod_login1" runat="server" />
</div>
<div class="centerAll">
<uc1:mod_login ID="Mod_login1" runat="server" />
</div>
</div>
</div>
</div>
Projects/WebGIM/GIM_site/gestAnagrTbl.aspx
-4
View File
@@ -1,4 +0,0 @@
<%@ Page Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" Inherits="gestAnagrTbl" Title="Untitled Page" Codebehind="gestAnagrTbl.aspx.cs" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
</asp:Content>
Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.cs
-18
View File
@@ -1,18 +0,0 @@
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;
public partial class gestAnagrTbl : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
Projects/WebGIM/GIM_site/gestAnagrTbl.aspx.designer.cs
Generated
-14
View File
@@ -1,14 +0,0 @@
//------------------------------------------------------------------------------
// <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.
// </auto-generated>
//------------------------------------------------------------------------------
public partial class gestAnagrTbl {
}
Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
+8 -5
View File
@@ -11,10 +11,11 @@ INSERT INTO FUNZIONE(COD_FUNZIONE, DESCRIZIONE) VALUES ('GIM_MR', 'GIM - Magazzi
INSERT INTO DIRITTI(USER_NAME,COD_CDC,COD_MODULO,COD_FUNZIONE,VALUE) VALUES ('Administrator', 'X999', 'GIM', 'GIM_MR', -1)
-- Permessi
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Locazioni', 'anagLocazioni.aspx', 1, 16, 'ANAG_Locazioni', 'ANAG_LocazioniLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ADV_MTZ_MagRic', 'magRic.aspx', 3, 4, 'ADV_MTZ_MagRic', 'ADV_MTZ_MagRicLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Tags', 'anagTags.aspx', 1, 17, 'anagTags', 'anagTagsLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Menu', 'menu.aspx', 0, 1, 'menu', 'menuIcon')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Locazioni', 'anagLocazioni', 1, 16, 'ANAG_Locazioni', 'ANAG_LocazioniLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ADV_MTZ_MagRic', 'magRic', 3, 4, 'ADV_MTZ_MagRic', 'ADV_MTZ_MagRicLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('ANAG_Tags', 'anagTags', 1, 17, 'anagTags', 'anagTagsLong')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Menu', 'menu', 0, 1, 'menu', 'menuIcon')
INSERT INTO Permessi (COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('chLang', 'chLang', 999, 3, 'chLang', 'chLangIcon')
-- Permessi2Funzione
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('ANAG_Locazioni', 'GIM_MR', 'S')
@@ -23,6 +24,7 @@ INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('M
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_SU', 'N')
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_MR', 'N')
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('Menu', 'GIM_AppAdmin', 'N')
INSERT INTO Permessi2Funzione (COD_PERMESSO,COD_FUNZIONE,[READWRITE]) VALUES ('chLang', 'GIM_AppAdmin', 'N')
-- FIX FriendlyURLS + icone FontAwesome nuova grafica
UPDATE permessi SET URL = REPLACE(URL, '.aspx', '')
@@ -105,7 +107,6 @@ exec voc.stp_insNewLemma'AnagTipoRisorsaIcon', 'fa fa-leaf'
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'
@@ -128,4 +129,6 @@ UPDATE vocabolario SET traduzione = 'Machine List Management' WHERE lemma = 'Mac
exec voc.stp_insNewLemma 'DettInterventoLong', 'Dettaglio Intervento'
UPDATE vocabolario SET traduzione = 'Event Detail' WHERE lemma = 'DettInterventoLong' AND Lingua = 'EN'
exec voc.stp_insNewLemma 'adminDB', 'DB Admin'
exec voc.stp_insNewLemma 'chLang', 'Language'
exec voc.stp_insNewLemma 'chLangIcon', 'fa fa-globe'