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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele Locatelli
2013-02-21 15:48:14 +01:00
parent 53a7fe443a 920734eba4
commit 8a6a85302a
18 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/Web.config
+2 -2
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="121" />
<add key="minRev" value="122" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -47,7 +47,7 @@
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<add key="MaxRowToDisplay" value="20" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx
+10 -11
View File
@@ -1,17 +1,16 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_textAutocomplete.ascx.cs"
Inherits="ETS_WS.WebUserControls.mod_textAutocomplete" %>
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_textAutocomplete.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_textAutocomplete" %>
<% if (false)
{ %>
<script src="../Scripts/jquery-1.6.4-vsdoc.js" type="text/javascript"></script>
<link href="../css/Style.css" rel="stylesheet" type="text/css" />
<link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.9.1.custom.min.css" rel="stylesheet" type="text/css" />
<% } %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<asp:TextBox runat="server" ID="hiddenFieldID" AutoPostBack="true" OnTextChanged="hiddenFieldID_TextChanged"
Visible="true" ViewStateMode="Enabled" Width="3em" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" />
<asp:TextBox runat="server" ID="txtValue" Width="90%" AutoPostBack="true"
ontextchanged="txtValue_TextChanged" />
<asp:AutoCompleteExtender ID="txtValueAce" runat="server" TargetControlID="txtValue"
ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoFonti" CompletionInterval="10"
MinimumPrefixLength="1" CompletionListCssClass="autocompleteListCssClass" CompletionListItemCssClass="autocomplete"
CompletionListHighlightedItemCssClass="autocompleteHiglight"
CompletionListElementID="autocompleteElemID" />
<asp:TextBox runat="server" ID="hiddenFieldID" AutoPostBack="true" OnTextChanged="hiddenFieldID_TextChanged" Visible="true"
ViewStateMode="Enabled" Width="3em" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" />
<asp:TextBox runat="server" ID="txtValue" Width="95%" AutoPostBack="true" OnTextChanged="txtValue_TextChanged" />
<asp:AutoCompleteExtender ID="txtValueAce" runat="server" TargetControlID="txtValue" ServicePath="~/WS/AutoCompletamento.asmx"
ServiceMethod="elencoFonti" CompletionInterval="10" MinimumPrefixLength="1" CompletionListCssClass="ui-corner-all autocompleteListCssClass"
CompletionListItemCssClass="autocomplete" CompletionListHighlightedItemCssClass="autocompleteHiglight" CompletionListElementID="autocompleteElemID"
CompletionSetCount="10" />
<asp:Button runat="server" ID="btnPost" OnClick="btnPost_Click" Visible="false" />
ETS-WS/ETS-WS/bin/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/css/BuildBlocks.css
+10 -15
View File
@@ -172,25 +172,13 @@
/* zona menù top */
.menuNav
{
background-color: #B5C7DE;
/*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD ));
background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -o-linear-gradient( #A5B7CE,#B8E1FD );
background-image: linear-gradient( #A5B7CE,#B8E1FD );*/
background-color: #B5C7DE; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); background-image: linear-gradient( #A5B7CE,#B8E1FD );*/
color: #284E98;
font-size: 1.2em;
}
.menuNavSel
{
background-color: #507CD1;
/*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE ));
background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -o-linear-gradient( #B8E1FD,#A5B7CE );
background-image: linear-gradient( #B8E1FD,#A5B7CE );*/
background-color: #507CD1; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); background-image: linear-gradient( #B8E1FD,#A5B7CE );*/
}
.menuItem
{
@@ -313,6 +301,7 @@
}
.autocompleteElemID
{
width: 400px;
background-color: Red;
font-weight: bold;
}
@@ -322,6 +311,12 @@
font-size: 8pt;
background-color: White;
padding: 2px 2px 2px 2px;
border: 1px solid #333;
/*
z-index: 1;
overflow: Auto;
height: 30em;
*/
}
/* @end */
@@ -491,4 +486,4 @@
.valignMiddle
{
vertical-align: middle;
}
}
ETS-WS/ETS-WS/css/BuildBlocks.css
+10 -15
View File
@@ -172,25 +172,13 @@
/* zona menù top */
.menuNav
{
background-color: #B5C7DE;
/*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD ));
background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD );
background-image: -o-linear-gradient( #A5B7CE,#B8E1FD );
background-image: linear-gradient( #A5B7CE,#B8E1FD );*/
background-color: #B5C7DE; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); background-image: linear-gradient( #A5B7CE,#B8E1FD );*/
color: #284E98;
font-size: 1.2em;
}
.menuNavSel
{
background-color: #507CD1;
/*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE ));
background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE );
background-image: -o-linear-gradient( #B8E1FD,#A5B7CE );
background-image: linear-gradient( #B8E1FD,#A5B7CE );*/
background-color: #507CD1; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); background-image: linear-gradient( #B8E1FD,#A5B7CE );*/
}
.menuItem
{
@@ -313,6 +301,7 @@
}
.autocompleteElemID
{
width: 400px;
background-color: Red;
font-weight: bold;
}
@@ -322,6 +311,12 @@
font-size: 8pt;
background-color: White;
padding: 2px 2px 2px 2px;
border: 1px solid #333;
/*
z-index: 1;
overflow: Auto;
height: 30em;
*/
}
/* @end */
@@ -491,4 +486,4 @@
.valignMiddle
{
vertical-align: middle;
}
}
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config
+2 -2
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="121" />
<add key="minRev" value="122" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -47,7 +47,7 @@
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<add key="MaxRowToDisplay" value="20" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config
+2 -2
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="121" />
<add key="minRev" value="122" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -47,7 +47,7 @@
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<add key="MaxRowToDisplay" value="20" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config
+2 -2
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="121" />
<add key="minRev" value="122" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -47,7 +47,7 @@
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<add key="MaxRowToDisplay" value="20" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config
+2 -2
View File
@@ -30,7 +30,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="121" />
<add key="minRev" value="122" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -47,7 +47,7 @@
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<add key="MaxRowToDisplay" value="20" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/bin/Release/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/utils.cs
+1 -1
View File
@@ -475,7 +475,7 @@ namespace ETS_Data
/// <returns></returns>
public static string cleanPathName(string originalName)
{
return originalName.Trim().Replace("&", "e").Replace(".", "").Replace(",", "").Replace(";", "").Replace(":", "").Replace("/", "-").Replace(@"\", "-").Replace(@"'", "").Replace("\"", "");
return originalName.Trim().Replace("&", "e").Replace(".", "").Replace(",", "").Replace(";", "").Replace(":", "").Replace("/", "-").Replace(@"\", "-").Replace(@"'", "_").Replace("\"", "_").Replace("#", "_").Replace("?", "_").Replace("*", "_");
}
/// <summary>
/// restituisce, in caso di null o stringa vuota, il carattere "*"