diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 510b3ff..326e163 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/App_Start/BundleConfig.cs b/WebSCR/App_Start/BundleConfig.cs index 0761f53..089d819 100644 --- a/WebSCR/App_Start/BundleConfig.cs +++ b/WebSCR/App_Start/BundleConfig.cs @@ -49,13 +49,13 @@ namespace WebSCR // "~/Scripts/jquery.validate*")); // aggiungo bundle dinamico x less --> css - //bundles.Add(new DynamicFolderBundle("less", "*.less")); + bundles.Add(new DynamicFolderBundle("less", "*.less")); // aggiungo bundle dinamico x coffee --> jscript //bundles.Add(new DynamicFolderBundle("coffee", "*.coffee")); - //// abilito boundle "forzato"! - //BundleTable.EnableOptimizations = true; + // abilito boundle "forzato"! + BundleTable.EnableOptimizations = true; } } } \ No newline at end of file diff --git a/WebSCR/Content/Style.css b/WebSCR/Content/Style.css new file mode 100644 index 0000000..52057e3 --- /dev/null +++ b/WebSCR/Content/Style.css @@ -0,0 +1,98 @@ +.baseRow { + background-color: #EFF3FB; +} +.altRow { + background-color: #FFF; +} +.editRow { + background-color: #2461bf; +} +.selectedRow { + background-color: #d1ddf1; + font-weight: 600; + color: #333333; +} +.headerRow { + background-color: #507cd1; + font-weight: 600; + color: white; +} +.footerRow { + background-color: #507cd1; + font-weight: 600; + color: white; +} +.pagerRow { + background-color: #2461bf; + color: white; + text-align: center; + margin: auto; +} +.text-center { + text-align: center; + margin: auto; +} +.tStrong { + font-weight: bold; + font-size: 1.3em; +} +.flRight { + float: right; +} +/* Query selezione dimensioni display... */ +@media all and (min-width: 768px) { + #textWrapper { + font-size: 1.0em; + } + #headData { + margin-top: 0px; + } +} +@media all and (min-width: 1024px) { + #textWrapper { + font-size: 1.1em; + } + #headData { + margin-top: 0px; + } +} +@media all and (min-width: 1440px) { + #textWrapper { + font-size: 1.2em; + } + #headData { + margin-top: 0px; + } +} +@media all and (min-width: 1600px) { + #textWrapper { + font-size: 1.3em; + } + #headData { + margin-top: 0px; + } +} +@media all and (max-width: 767px) { + #textWrapper { + font-size: 0.8em; + } + #headData { + margin-top: 6px; + } +} +@media all and (max-width: 480px) { + #textWrapper { + font-size: 0.6em; + } + #headData { + margin-top: 14px; + } +} +@media all and (max-width: 320px) { + #textWrapper { + font-size: 0.5em; + } + #headData { + margin-top: 18px; + } +} diff --git a/WebSCR/Content/Style.less b/WebSCR/Content/Style.less index 6009b5d..9313611 100644 --- a/WebSCR/Content/Style.less +++ b/WebSCR/Content/Style.less @@ -58,6 +58,7 @@ float: right; } + /* Query selezione dimensioni display... */ @media all and (min-width: 768px) { #textWrapper { diff --git a/WebSCR/Content/Style.min.css b/WebSCR/Content/Style.min.css new file mode 100644 index 0000000..c71b7dd --- /dev/null +++ b/WebSCR/Content/Style.min.css @@ -0,0 +1 @@ +.baseRow{background-color:#eff3fb}.altRow{background-color:#fff}.editRow{background-color:#2461bf}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333}.headerRow{background-color:#507cd1;font-weight:600;color:#fff}.footerRow{background-color:#507cd1;font-weight:600;color:#fff}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}}@media all and (min-width:1024px){#textWrapper{font-size:1.1em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.3em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}}@media all and (max-width:480px){#textWrapper{font-size:.6em}#headData{margin-top:14px}}@media all and (max-width:320px){#textWrapper{font-size:.5em}#headData{margin-top:18px}} \ No newline at end of file diff --git a/WebSCR/Content/WebSCR.css b/WebSCR/Content/WebSCR.css index 38ec244..d64e8b4 100644 --- a/WebSCR/Content/WebSCR.css +++ b/WebSCR/Content/WebSCR.css @@ -1,4 +1,4 @@ -.greenBox { +.greenBox { background-color: #c3ffc3; border: 1px solid #00a400; color: #333333; @@ -185,3 +185,31 @@ -webkit-border-radius: 5px; border-radius: 5px; } +/* divisione schermo */ +.div_1_3 { + width: 33%; +} +.div_2_3 { + width: 66%; +} +.div_1_2 { + width: 50%; +} +.div_1_4 { + width: 25%; +} +.div_3_4 { + width: 75%; +} +.div_1_5 { + width: 20%; +} +.div_2_5 { + width: 40%; +} +.div_3_5 { + width: 60%; +} +.div_4_5 { + width: 80%; +} diff --git a/WebSCR/Content/WebSCR.less b/WebSCR/Content/WebSCR.less index 42e2501..47f8fed 100644 --- a/WebSCR/Content/WebSCR.less +++ b/WebSCR/Content/WebSCR.less @@ -292,4 +292,34 @@ -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; +} + + +/* divisione schermo */ +.div_1_3{ + width: 33%; +} +.div_2_3{ + width: 66%; +} +.div_1_2{ + width: 50%; +} +.div_1_4{ + width: 25%; +} +.div_3_4{ + width: 75%; +} +.div_1_5{ + width: 20%; +} +.div_2_5{ + width: 40%; +} +.div_3_5{ + width: 60%; +} +.div_4_5{ + width: 80%; } \ No newline at end of file diff --git a/WebSCR/Content/WebSCR.min.css b/WebSCR/Content/WebSCR.min.css index de58887..2161cc7 100644 --- a/WebSCR/Content/WebSCR.min.css +++ b/WebSCR/Content/WebSCR.min.css @@ -1 +1 @@ -.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.yellowBox{background-color:#ffffb6;border:1px solid #b1b100;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.flLeft{float:left}.calendar_white_main{border:1px solid #999}.calendar_white_scroll_up{background:url(calendar_white/up.png)}.calendar_white_scroll_down{background:url(calendar_white/down.png)}.calendar_white_rowheader_inner,.calendar_white_cornerright_inner,.calendar_white_corner_inner,.calendar_white_colheader_inner,.calendar_white_alldayheader_inner{color:#666;background:#eee;background:-moz-linear-gradient(top,#eee 0%,#ddd);background:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee",endColorStr="#dddddd")}.calendar_white_cornerright_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-bottom:1px solid #999}.calendar_white_rowheader_inner{font-size:16pt;text-align:right;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_corner_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_rowheader_minutes{font-size:10px;vertical-align:super;padding-left:2px;padding-right:2px}.calendar_white_colheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_cell_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background-color:#fff}.calendar_white_alldayheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_message{opacity:.9;filter:alpha(opacity=90);padding:10px;color:#fff;background:#ffa216;background:-moz-linear-gradient(top,#ffa216 0%,#ff8400);background:-webkit-gradient(linear,left top,left bottom,from(#ffa216),to(#ff8400));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216",endColorStr="#ff8400")}.calendar_white_alldayevent_inner,.calendar_white_event_inner{color:#666;background:#fff;background:-moz-linear-gradient(top,#fff 0%,#eee);background:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eee));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff",endColorStr="#eeeeee");border:1px solid #999;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8)}.calendar_white_selected .calendar_white_event_inner{background:#ddd}.calendar_white_alldayevent_inner{position:absolute;top:2px;bottom:2px;left:2px;right:1px;padding:2px;margin-right:1px;font-size:12px}.calendar_white_event_withheader .calendar_white_event_inner{padding-top:15px}.calendar_white_event{cursor:default}.calendar_white_event_inner{position:absolute;overflow:hidden;top:0;bottom:2px;left:2px;right:0;padding:2px;font-size:12px}.calendar_white_shadow_inner{background-color:#666;opacity:.5;filter:alpha(opacity=70);height:100%;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px} \ No newline at end of file +.greenBox{background-color:#c3ffc3;border:1px solid #00a400;color:#333}.yellowBox{background-color:#ffffb6;border:1px solid #b1b100;color:#333}.orangeBox{background-color:#ffa05b;border:1px solid #be5100;color:#333}.redBox{background-color:#ff9c9c;border:1px solid #cb0000;color:#333}.grayBox{background-color:#d6d6d6;border:1px solid #707070;color:#333}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.flLeft{float:left}.calendar_white_main{border:1px solid #999}.calendar_white_scroll_up{background:url(calendar_white/up.png)}.calendar_white_scroll_down{background:url(calendar_white/down.png)}.calendar_white_rowheader_inner,.calendar_white_cornerright_inner,.calendar_white_corner_inner,.calendar_white_colheader_inner,.calendar_white_alldayheader_inner{color:#666;background:#eee;background:-moz-linear-gradient(top,#eee 0%,#ddd);background:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#eeeeee",endColorStr="#dddddd")}.calendar_white_cornerright_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-bottom:1px solid #999}.calendar_white_rowheader_inner{font-size:16pt;text-align:right;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_corner_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_rowheader_minutes{font-size:10px;vertical-align:super;padding-left:2px;padding-right:2px}.calendar_white_colheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_cell_inner{position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background-color:#fff}.calendar_white_alldayheader_inner{text-align:center;position:absolute;top:0;left:0;bottom:0;right:0;border-right:1px solid #999;border-bottom:1px solid #999}.calendar_white_message{opacity:.9;filter:alpha(opacity=90);padding:10px;color:#fff;background:#ffa216;background:-moz-linear-gradient(top,#ffa216 0%,#ff8400);background:-webkit-gradient(linear,left top,left bottom,from(#ffa216),to(#ff8400));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffa216",endColorStr="#ff8400")}.calendar_white_alldayevent_inner,.calendar_white_event_inner{color:#666;background:#fff;background:-moz-linear-gradient(top,#fff 0%,#eee);background:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#eee));filter:progid:DXImageTransform.Microsoft.Gradient(startColorStr="#ffffff",endColorStr="#eeeeee");border:1px solid #999;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8);box-shadow:0 2px 3px rgba(0,0,0,.3),inset 0 0 2px rgba(255,255,255,.8)}.calendar_white_selected .calendar_white_event_inner{background:#ddd}.calendar_white_alldayevent_inner{position:absolute;top:2px;bottom:2px;left:2px;right:1px;padding:2px;margin-right:1px;font-size:12px}.calendar_white_event_withheader .calendar_white_event_inner{padding-top:15px}.calendar_white_event{cursor:default}.calendar_white_event_inner{position:absolute;overflow:hidden;top:0;bottom:2px;left:2px;right:0;padding:2px;font-size:12px}.calendar_white_shadow_inner{background-color:#666;opacity:.5;filter:alpha(opacity=70);height:100%;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.div_1_3{width:33%}.div_2_3{width:66%}.div_1_2{width:50%}.div_1_4{width:25%}.div_3_4{width:75%}.div_1_5{width:20%}.div_2_5{width:40%}.div_3_5{width:60%}.div_4_5{width:80%} \ No newline at end of file diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 6438087..5cb99d5 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -322,11 +322,17 @@ + + Style.less + + + Style.css + WebSCR.less - WebSCR.less + WebSCR.css @@ -349,6 +355,7 @@ Always + Designer diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index d940e51..6f39c2a 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -9,18 +9,20 @@
-
+
Ricerca per Documento
-
+
Ricerca per Periodo
-
+
+
+
-
+
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 1a44fef..9a5ddd6 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 2c8d062..82f55f1 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index bbc3e6d..9a38510 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/compilerconfig.json b/WebSCR/compilerconfig.json new file mode 100644 index 0000000..13ce3c3 --- /dev/null +++ b/WebSCR/compilerconfig.json @@ -0,0 +1,10 @@ +[ + { + "outputFile": "Content/Style.css", + "inputFile": "Content/Style.less" + }, + { + "outputFile": "Content/WebSCR.css", + "inputFile": "Content/WebSCR.less" + } +] \ No newline at end of file diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 1a44fef..9a5ddd6 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index bbc3e6d..9a38510 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 3d78bd5..5864782 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index bbc3e6d..9a38510 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ