diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt index 7c7f2b9..fbd032c 100644 --- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..9b27ce9 Binary files /dev/null and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 737c382..47f60c9 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css index 85fd4c1..02136e1 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.css @@ -159,8 +159,22 @@ A:hover { /*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 { - width: 200px; +.MenuItem { + background-color: #7A95FF; + font-family: Microsoft Sans Serif; + font-size: 12px; + color: White; + padding: 5px 10px 5px 10px; + border-color: Black; + border-style: solid; + border-width: 1px 1px 0px 1px; +} +.MenuHover { + background-color: #6181FF; +} +.MenuSelected { + background-color: #476CFF; + padding: 6px 12px 5px 12px; } /* end zona menu */ /* zona colorazione filtri */ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less index 99aac5e..73eee6a 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.less +++ b/PROJ-ETS/PROJ-ETS/Content/Style.less @@ -112,20 +112,19 @@ A:hover { /* update controls */ /* colore testi */ -.textArancio -{ +.textArancio { color: #FFAA33; } -.textAzzurro -{ + +.textAzzurro { color: #36F; } -.textNero -{ + +.textNero { color: #000; } -.textGrigio -{ + +.textGrigio { color: #888; } @@ -186,8 +185,24 @@ A:hover { 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 { - width: 200px; +.MenuItem { + background-color: #7A95FF; + font-family: Microsoft Sans Serif; + font-size: 12px; + color: White; + padding: 5px 10px 5px 10px; + border-color: Black; + border-style: solid; + border-width: 1px 1px 0px 1px; +} + +.MenuHover { + background-color: #6181FF; +} + +.MenuSelected { + background-color: #476CFF; + padding: 6px 12px 5px 12px; } /* end zona menu */ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css index fa2d17b..26e9050 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.min.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css @@ -1 +1 @@ -@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.menuItem{width:200px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle} \ No newline at end of file +@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.MenuItem{background-color:#7a95ff;font-family:Microsoft Sans Serif;font-size:12px;color:#fff;padding:5px 10px 5px 10px;border-color:#000;border-style:solid;border-width:1px 1px 0 1px}.MenuHover{background-color:#6181ff}.MenuSelected{background-color:#476cff;padding:6px 12px 5px 12px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 8a2eacb..9d92f44 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -488,6 +488,9 @@ + + Designer + Web.config diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx b/PROJ-ETS/PROJ-ETS/Progetti.aspx index 1ecab75..891de6a 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx @@ -14,6 +14,12 @@ + + + + + +
-
+
-
+
diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs index 054dd78..19fa814 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs @@ -12,6 +12,24 @@ namespace PROJ_ETS { public partial class Progetti { + /// + /// Menu1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Menu Menu1; + + /// + /// NavProgetti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SiteMapDataSource NavProgetti; + /// /// mod_progetti1 control. /// diff --git a/PROJ-ETS/PROJ-ETS/Progetti.sitemap b/PROJ-ETS/PROJ-ETS/Progetti.sitemap new file mode 100644 index 0000000..56311af --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/Progetti.sitemap @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index 1cbac1c..bd81ee5 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -4,108 +4,113 @@ http://go.microsoft.com/fwlink/?LinkId=169433 --> - - -
- -
-
-
-
- + + +
+ +
+
+
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index b38daba..2bde1f0 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -22,7 +22,7 @@ - <%----%> + diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 737c382..47f60c9 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index f99a42a..675e019 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7edaea5..11ae710 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache index d064c4e..7bf4ab7 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll index f99a42a..675e019 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ