diff --git a/GMW/App_Start/BundleConfig.cs b/GMW/App_Start/BundleConfig.cs index 3c16b49f..0746c632 100644 --- a/GMW/App_Start/BundleConfig.cs +++ b/GMW/App_Start/BundleConfig.cs @@ -48,8 +48,8 @@ namespace GMW // aggiungo bundle dinamico x coffee --> jscript //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); - // abilito bundle "forzato"! - BundleTable.EnableOptimizations = true; + //// abilito bundle "forzato"! + //BundleTable.EnableOptimizations = true; } } } \ No newline at end of file diff --git a/GMW/Bootstrap.Master b/GMW/Bootstrap.Master index 6019dc31..f6df2113 100644 --- a/GMW/Bootstrap.Master +++ b/GMW/Bootstrap.Master @@ -9,18 +9,18 @@ - + - <%: Page.Title %> - C2P + <%: Page.Title %> - GMW <%: Scripts.Render("~/bundles/modernizr") %> <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> - + <%----%> @@ -100,7 +100,6 @@ <%----%> - diff --git a/GMW/Bundle.config b/GMW/Bundle.config index 919ae9a7..5c1a2eb1 100644 --- a/GMW/Bundle.config +++ b/GMW/Bundle.config @@ -7,6 +7,7 @@ + diff --git a/GMW/Content/bootstrap-theme.css b/GMW/Content/bootstrap-theme.css index fdfaba9c..49aedcd9 100644 --- a/GMW/Content/bootstrap-theme.css +++ b/GMW/Content/bootstrap-theme.css @@ -40,18 +40,18 @@ .btn-default { text-shadow: 0 1px 0 #fff; - background-image: -webkit-linear-gradient(top, #e5e5e5 0%, #767676 100%); - background-image: linear-gradient(to bottom, #e5e5e5 0%, #767676 100%); + background-image: -webkit-linear-gradient(top, #e9e9e9 20%, #878787 100%); + background-image: linear-gradient(to bottom, #e9e9e9 20%, #878787 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cdcdcdfffff', endColorstr='#ffe0e0e0', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); background-repeat: repeat-x; - border-color: #767676; + border-color: #878787; color: #000; } .btn-default:hover, .btn-default:focus { - background-color: #767676; + background-color: #878787; background-position: 0 -15px; text-shadow: 0 1px 0 #000; color: #fff; diff --git a/GMW/Content/bootstrap-theme.min.css b/GMW/Content/bootstrap-theme.min.css index eba80fdd..a33928fe 100644 --- a/GMW/Content/bootstrap-theme.min.css +++ b/GMW/Content/bootstrap-theme.min.css @@ -1 +1 @@ -.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{color:#fff;font-weight:400;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#e5e5e5 0%,#767676 100%);background-image:linear-gradient(to bottom,#e5e5e5 0%,#767676 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cdcdcdfffff',endColorstr='#ffe0e0e0',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#767676;color:#000}.btn-default:hover,.btn-default:focus{background-color:#767676;background-position:0 -15px;text-shadow:0 1px 0 #000;color:#fff}.btn-default:active,.btn-default.active{background-color:#b5b5b5;border-color:#b5b5b5;text-shadow:0 1px 0 #000;color:#fff}.btn-primary{color:#fff;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3596e7 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3596e7 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff2d6ca2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#3596e7;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#3596e7;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0%,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0%,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff419641',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0%,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0%,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2aabd2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9;color:#c9d6d3}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0%,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0%,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf0ad4e',endColorstr='#ffeb9316',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0%,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0%,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-inverse{background-image:-webkit-linear-gradient(top,#787878 0%,#151515 100%);background-image:linear-gradient(to bottom,#787878 0%,#151515 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#676767;color:#ababab}.btn-inverse:hover,.btn-inverse:focus{background-color:#151515;background-position:0 -15px;color:#fff}.btn-inverse:active,.btn-inverse.active{background-color:#151515;border-color:#676767}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0%,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf5f5f5',endColorstr='#ffe8e8e8',GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#357ebd 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#4387bf 0%,#f8f8f8 100%);background-image:linear-gradient(to bottom,#4387bf 0%,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bffffff',endColorstr='#4387bf8f8f8',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0%,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0%,#f3f3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#4387bf3f3f3',GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0%,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0%,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0%,#282828 100%);background-image:linear-gradient(to bottom,#222 0%,#282828 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff282828',GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0%,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0%,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0%,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0%,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0%,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0%,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bfcf8e3',endColorstr='#4387bf8efc0',GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0%,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0%,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf2dede',endColorstr='#ffe7c3c3',GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0%,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#4387bf5f5f5',GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3071a9 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3071a9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0%,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0%,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0%,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0%,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0%,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0%,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf0ad4e',endColorstr='#ffec971f',GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0%,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0%,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0);background-repeat:repeat-x}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3278b3 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3278b3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0);background-repeat:repeat-x;border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0%,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf5f5f5',endColorstr='#ffe8e8e8',GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#357ebd 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0%,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0%,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0%,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0%,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0%,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0%,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bfcf8e3',endColorstr='#4387bfaf2cc',GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0%,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0%,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf2dede',endColorstr='#ffebcccc',GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0%,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#4387bf5f5f5',GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file +.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{color:#fff;font-weight:400;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#e9e9e9 20%,#878787 100%);background-image:linear-gradient(to bottom,#e9e9e9 20%,#878787 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cdcdcdfffff',endColorstr='#ffe0e0e0',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#878787;color:#000}.btn-default:hover,.btn-default:focus{background-color:#878787;background-position:0 -15px;text-shadow:0 1px 0 #000;color:#fff}.btn-default:active,.btn-default.active{background-color:#b5b5b5;border-color:#b5b5b5;text-shadow:0 1px 0 #000;color:#fff}.btn-primary{color:#fff;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3596e7 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3596e7 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff2d6ca2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#3596e7;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#3596e7;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0%,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0%,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff419641',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0%,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0%,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2aabd2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9;color:#c9d6d3}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0%,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0%,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf0ad4e',endColorstr='#ffeb9316',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0%,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0%,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-inverse{background-image:-webkit-linear-gradient(top,#787878 0%,#151515 100%);background-image:linear-gradient(to bottom,#787878 0%,#151515 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#676767;color:#ababab}.btn-inverse:hover,.btn-inverse:focus{background-color:#151515;background-position:0 -15px;color:#fff}.btn-inverse:active,.btn-inverse.active{background-color:#151515;border-color:#676767}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0%,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf5f5f5',endColorstr='#ffe8e8e8',GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#357ebd 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#4387bf 0%,#f8f8f8 100%);background-image:linear-gradient(to bottom,#4387bf 0%,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bffffff',endColorstr='#4387bf8f8f8',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0%,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0%,#f3f3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#4387bf3f3f3',GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0%,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0%,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0%,#282828 100%);background-image:linear-gradient(to bottom,#222 0%,#282828 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff282828',GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0%,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0%,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0%,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0%,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0%,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0%,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bfcf8e3',endColorstr='#4387bf8efc0',GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0%,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0%,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf2dede',endColorstr='#ffe7c3c3',GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0%,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#4387bf5f5f5',GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3071a9 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3071a9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0%,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0%,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0%,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0%,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0%,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0%,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf0ad4e',endColorstr='#ffec971f',GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0%,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0%,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0);background-repeat:repeat-x}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#3278b3 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#3278b3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0);background-repeat:repeat-x;border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0%,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf5f5f5',endColorstr='#ffe8e8e8',GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#3b9ff3 0%,#357ebd 100%);background-image:linear-gradient(to bottom,#3b9ff3 0%,#357ebd 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0%,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0%,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0%,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0%,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0%,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0%,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bfcf8e3',endColorstr='#4387bfaf2cc',GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0%,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0%,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4387bf2dede',endColorstr='#ffebcccc',GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0%,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0%,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#4387bf5f5f5',GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index a4bc4ebd..52c2a501 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -399,6 +399,7 @@ + @@ -1477,6 +1478,10 @@ AutoCompletamento.asmx Component + + DataFeed.asmx + Component + @@ -1848,7 +1853,6 @@ - @@ -1869,6 +1873,9 @@ Designer + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/GMW/Search.Master b/GMW/Search.Master index 77166d2c..de4b6392 100644 --- a/GMW/Search.Master +++ b/GMW/Search.Master @@ -16,11 +16,11 @@ - + - <%: Page.Title %> - C2P + <%: Page.Title %> - GMW <%: Scripts.Render("~/bundles/modernizr") %> diff --git a/GMW/Web.config b/GMW/Web.config index 0f2da7e9..6faf76f6 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -73,7 +73,7 @@ - + diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/WebUserControls/mod_SearchProvUDC.ascx index 8e75e550..a4999f44 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -13,7 +13,7 @@
- +
diff --git a/GMW/WebUserControls/mod_combobox.ascx b/GMW/WebUserControls/mod_combobox.ascx new file mode 100644 index 00000000..b511f58e --- /dev/null +++ b/GMW/WebUserControls/mod_combobox.ascx @@ -0,0 +1,105 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_combobox.ascx.cs" Inherits="GMW.WebUserControls.mod_combobox" %> +<%if (false) + { %> + + +<%} %> + + +<%--controlli "principali"--%> +
+ + + + + + + <%--controlli "accessori"--%> + + + + + +
+ + diff --git a/GMW/WebUserControls/mod_combobox.ascx.cs b/GMW/WebUserControls/mod_combobox.ascx.cs new file mode 100644 index 00000000..aac22986 --- /dev/null +++ b/GMW/WebUserControls/mod_combobox.ascx.cs @@ -0,0 +1,270 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace GMW.WebUserControls +{ + public partial class mod_combobox : System.Web.UI.UserControl + { + /// + /// evento valore selezionato + /// + public event EventHandler eh_valSelezionato; + /// + /// evento valore selezionato + /// + public event EventHandler eh_reset; + /// + /// segnaposto x casella testuale autocomplete + /// + public string placeholder { get; set; } + + /// + /// UID formattato con "_" + /// + public string uid + { + get + { + // fix brutale: nelle pagine master c'è un ctl00_ iniziale di troppo... + return this.UniqueID.Replace("$", "_").Replace("ctl00_", "").Replace("ctl01_", ""); + } + } + + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + defaultVal = ""; + txtSelezione.Attributes["placeholder"] = placeholder; + } + } + + protected void txtSelezione_TextChanged(object sender, EventArgs e) + { + if (txtSelezione.Text.Trim() == "") + { + hiddenFieldID.Text = defaultVal; + _valore = defaultVal; + if (eh_valSelezionato != null) + { + eh_valSelezionato(this, new EventArgs()); + } + } + } + + /// + /// salvo valore selezionato! + /// + /// + /// + protected void hiddenFieldID_TextChanged(object sender, EventArgs e) + { + _valore = hiddenFieldID.Text; + if (eh_valSelezionato != null) + { + eh_valSelezionato(this, new EventArgs()); + } + } + /// + /// valore selezionato dal controllo (RW local) + /// + protected string _valore + { + get + { + return memLayer.ML.StringSessionObj(uid + "_sel"); + } + set + { + memLayer.ML.setSessionVal(uid + "_sel", value); + } + } + /// + /// salva evento selezione + /// + /// + /// + protected void btnPost_Click(object sender, EventArgs e) + { + _valore = hiddenFieldID.Text; + if (eh_valSelezionato != null) + { + eh_valSelezionato(this, new EventArgs()); + } + } + + /// + /// valore (chiave) selezionato dal controllo (R public) + /// + public string valore + { + get + { + return hiddenFieldID.Text; + } + set + { + hiddenFieldID.Text = value; + } + } + /// + /// label selezionato dal controllo (R public) + /// + public string selezione + { + get + { + return txtSelezione.Text; + } + set + { + txtSelezione.Text = value; + } + } + /// + /// label dell'etichetta di ricerca + /// + public string labelRicerca + { + set + { + lblField.Text = value; + } + } + /// + /// num minimo caratteri x autocomplete + /// + public Int32 minCharAutocomplete + { + get + { + return Convert.ToInt32(txtMinCharAutoCom.Text); + } + set + { + txtMinCharAutoCom.Text = value.ToString(); + } + } + /// + /// path del webservice (compreso metodo) + /// nb: DI NORMA fornisce risultati nel formato label#valore + /// + public string ServicePath + { + get + { + return txtServiceUrl.Text; + } + set + { + txtServiceUrl.Text = value; + } + } + /// + /// imposta visibilità della textBox delle chiavi + /// + public bool showKey + { + set + { + if (!value) + { + hiddenFieldID.Width = Unit.Pixel(0); + } + } + } + /// + /// imposta la stringa tooltip + /// + public string toolTip + { + set + { + txtSelezione.ToolTip = value; + } + } + + /// + /// larghezza textbox in unità EM + /// + public int textEmWidht + { + set + { + txtSelezione.Width = Unit.Parse(string.Format("{0}em", value)); + } + } + /// + /// larghezza textbox in unità % + /// + public int textEmPerc + { + set + { + txtSelezione.Width = Unit.Parse(string.Format("{0}%", value)); + } + } + /// + /// imposta il focus sulla textBox + /// + public void setFocus() + { + txtSelezione.Focus(); + } + /// + /// permette di passare altri parametri di contesto al metodo invocato x autocomplete + /// + public string contextKey + { + get + { + return txtSelezione.AccessKey; + } + set + { + txtSelezione.AccessKey = value; + } + } + /// + /// tabIndex del controllo + /// + public short TabIndex + { + set + { + txtSelezione.TabIndex = value; + } + } + /// + /// valore di default (x reset) + /// + public string defaultVal { get; set; } + + /// + /// effettuato reset + /// + /// + /// + protected void lnkReset_Click(object sender, EventArgs e) + { + // resetto selezione e ricerca! + txtSelezione.Text = ""; + hiddenFieldID.Text = defaultVal; + _valore = defaultVal; + if (eh_reset != null) + { + eh_reset(this, new EventArgs()); + } + } + } +} \ No newline at end of file diff --git a/GMW/WebUserControls/mod_combobox.ascx.designer.cs b/GMW/WebUserControls/mod_combobox.ascx.designer.cs new file mode 100644 index 00000000..77e96550 --- /dev/null +++ b/GMW/WebUserControls/mod_combobox.ascx.designer.cs @@ -0,0 +1,96 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_combobox { + + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// lblField control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblField; + + /// + /// btnPost control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnPost; + + /// + /// txtSelezione control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSelezione; + + /// + /// hiddenFieldID control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox hiddenFieldID; + + /// + /// txtMinCharAutoCom control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMinCharAutoCom; + + /// + /// txtServiceUrl control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtServiceUrl; + + /// + /// lnkReset control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lnkReset; + } +} diff --git a/GMW/WebUserControls/mod_execUDC.ascx b/GMW/WebUserControls/mod_execUDC.ascx index 6c06c5a0..666c0899 100644 --- a/GMW/WebUserControls/mod_execUDC.ascx +++ b/GMW/WebUserControls/mod_execUDC.ascx @@ -1,39 +1,62 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_execUDC" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -<% if (false) - { %> - -<% } %> +<%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>--%> +<%@ Register src="mod_autocomplete.ascx" tagname="mod_autocomplete" tagprefix="uc1" %> + +<%if (false) + { %> + + +<%} %> + +
-
-
- +
+
+
-
- +
+
+
+
-
-
- +
+
+

[ALT-U]
- - +
-
+
+
+

- - + <%----%> + <%----%> + +
[ALT-W]
- - - + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
@@ -45,8 +68,6 @@
[ALT-N]
- - - +
diff --git a/GMW/WebUserControls/mod_execUDC.ascx.cs b/GMW/WebUserControls/mod_execUDC.ascx.cs index b73e890e..f50512c2 100644 --- a/GMW/WebUserControls/mod_execUDC.ascx.cs +++ b/GMW/WebUserControls/mod_execUDC.ascx.cs @@ -38,9 +38,11 @@ namespace GMW.WebUserControls btnQta.Text = traduci("btnQta"); btnSposta.Text = traduci("btnSposta"); btnEditNote.Text = traduci("btnEditNote"); +#if false cbeQta.ConfirmText = traduci("confermaRettificaQta"); cbeSposta.ConfirmText = traduci("confermaSpostamentoUDC"); - cbeEditNote.ConfirmText = traduci("confermaEditNote"); + cbeEditNote.ConfirmText = traduci("confermaEditNote"); +#endif } /// /// evento btnGoToMag @@ -105,7 +107,7 @@ namespace GMW.WebUserControls bool cellaToOk = false; try { - DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.Text)[0]; + DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.valore)[0]; IdxCellaTo = rowCella.IdxCella; // controllo che la cella di destinazione NON sia bloccata cellaToOk = rowCella.Attiva; @@ -161,7 +163,7 @@ namespace GMW.WebUserControls private void azzeraPostUpdate() { lblErrore.Visible = false; - txtNewCella.Text = ""; + txtNewCella.valore = ""; txtQta.Text = ""; } /// diff --git a/GMW/WebUserControls/mod_execUDC.ascx.designer.cs b/GMW/WebUserControls/mod_execUDC.ascx.designer.cs index 62ebcf4c..93722802 100644 --- a/GMW/WebUserControls/mod_execUDC.ascx.designer.cs +++ b/GMW/WebUserControls/mod_execUDC.ascx.designer.cs @@ -12,6 +12,24 @@ namespace GMW.WebUserControls { public partial class mod_execUDC { + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// /// btnGo2Mag control. /// @@ -57,15 +75,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnQta; - /// - /// cbeQta control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.ConfirmButtonExtender cbeQta; - /// /// lblNewPos control. /// @@ -82,16 +91,7 @@ namespace GMW.WebUserControls { /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtNewCella; - - /// - /// aceParticolare control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare; + protected global::GMW.WebUserControls.mod_autocomplete txtNewCella; /// /// btnSposta control. @@ -102,15 +102,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnSposta; - /// - /// cbeSposta control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.ConfirmButtonExtender cbeSposta; - /// /// lblErrore control. /// @@ -146,14 +137,5 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnEditNote; - - /// - /// cbeEditNote control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.ConfirmButtonExtender cbeEditNote; } } diff --git a/GMW/WebUserControls/mod_listUDC.ascx b/GMW/WebUserControls/mod_listUDC.ascx index 0d2df05b..e92cc300 100644 --- a/GMW/WebUserControls/mod_listUDC.ascx +++ b/GMW/WebUserControls/mod_listUDC.ascx @@ -19,8 +19,8 @@ - + <%: traduci("Reset") %>
- GMWmag + GMWmag
@@ -35,7 +35,7 @@
  - + <%: traduci("btnSearch") %>
diff --git a/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/WebUserControls/mod_searchMag.ascx.cs index f1b10148..5606c428 100644 --- a/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -73,7 +73,6 @@ namespace GMW.WebUserControls { chkLikeType.Text = traduci("AbilitaRicercaLike"); chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl"); - btnSearch.Text = traduci("btnSearch"); TBWE_search.WatermarkText = traduci("insertCod4search"); } protected void txtSearch_TextChanged(object sender, EventArgs e) diff --git a/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index ab324175..093b87d0 100644 --- a/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -49,13 +49,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.WebControls.TextBox txtSearch; /// - /// btnSearch control. + /// lbnSearch control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button btnSearch; + protected global::System.Web.UI.WebControls.LinkButton lbnSearch; /// /// TBWE_search control. diff --git a/GMW/WebUserControls/mod_testata.ascx.cs b/GMW/WebUserControls/mod_testata.ascx.cs index dd519277..21879011 100644 --- a/GMW/WebUserControls/mod_testata.ascx.cs +++ b/GMW/WebUserControls/mod_testata.ascx.cs @@ -42,9 +42,16 @@ namespace GMW.WebUserControls /// private void setPageName() { - DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0]; - lblTitolo.Text = traduci(riga.NOME); - lblIconTitolo.CssClass = traduci(riga.DESCRIZIONE); + try + { + DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0]; + lblTitolo.Text = traduci(riga.NOME); + lblIconTitolo.CssClass = traduci(riga.DESCRIZIONE); + } + catch + { + lblTitolo.Text = "PAGINA"; + } } /// /// wrapper traduzione diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 9ba81e44..77dd3ce2 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index a93c1072..c99b63d0 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 45f4b7ad..1aac5770 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 85e80117..81c23442 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/ReleaseClienti/SP_test/GMW.zip b/ReleaseClienti/SP_test/GMW.zip index ca2b1b09..e45abd56 100644 Binary files a/ReleaseClienti/SP_test/GMW.zip and b/ReleaseClienti/SP_test/GMW.zip differ diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index c078ff09..54f70c8b 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.612.1527")] -[assembly: AssemblyFileVersion("2.5.612.1527")] +[assembly: AssemblyVersion("2.5.613.1529")] +[assembly: AssemblyFileVersion("2.5.613.1529")] //[assembly: AssemblyCopyright("© Steamware 2007-2014")] //[assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 859c1fb8..b47f79c6 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.612.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.612.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.613.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.613.<#= this.RevisionNumber #>")] //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")] //[assembly: AssemblyCompany("Steamware")] <#+