diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index b9cd2bc..7a89be9 100644 Binary files a/.vs/ScheMe-SP/v15/sqlite3/storage.ide and b/.vs/ScheMe-SP/v15/sqlite3/storage.ide differ diff --git a/ScheMe-SP/Accettazione.aspx b/ScheMe-SP/Accettazione.aspx index 6e4d400..73b9f27 100644 --- a/ScheMe-SP/Accettazione.aspx +++ b/ScheMe-SP/Accettazione.aspx @@ -27,10 +27,10 @@
-
+
-
+
Nuovo
diff --git a/ScheMe-SP/Content/Style.css b/ScheMe-SP/Content/Style.css index d4b52d1..3a31b4c 100644 --- a/ScheMe-SP/Content/Style.css +++ b/ScheMe-SP/Content/Style.css @@ -79,6 +79,9 @@ color: black; } /*Buttons...*/ +.btn.btn-square { + border-radius: 0; +} .btn-circle { width: 2.2em; /*30px*/ diff --git a/ScheMe-SP/Content/Style.less b/ScheMe-SP/Content/Style.less index 660d6a2..e561560 100644 --- a/ScheMe-SP/Content/Style.less +++ b/ScheMe-SP/Content/Style.less @@ -113,6 +113,10 @@ } /*Buttons...*/ +.btn.btn-square { + border-radius: 0; +} + .btn-circle { width: 2.2em; /*30px*/ height: 2.2em; diff --git a/ScheMe-SP/Content/Style.min.css b/ScheMe-SP/Content/Style.min.css index b959c50..7b23337 100644 --- a/ScheMe-SP/Content/Style.min.css +++ b/ScheMe-SP/Content/Style.min.css @@ -1 +1 @@ -.uppercase{text-transform:uppercase;}.bigBtn{min-height:2.2em;font-size:1.2em;}.smaller{font-size:.7em;}.fullWidth>.navbar-nav{display:table;width:100%;margin:0;}.fullWidth>.navbar-nav>li{float:none;display:table-cell;text-align:center;}.VVF-CL-01{color:#060;background-color:#fff;}.VVF-CL-02{color:#ff3;background-color:#22f;}.VVF-CL-03{color:#ff3;background-color:#181;}.VVF-CL-04{background-color:#ff1;}.VVF-CL-05{color:#ff3;background-color:#e62;}.VVF-CL-06{color:#ff1;background-color:#ff0c0c;}.headerRow{background-color:#eee;color:#000;}.text-center{text-align:center;margin:auto;}.tStrong{font-weight:bold;font-size:1.3em;}.flRight{float:right;}.errore{color:#f00;}.headLine{background-color:#38c;color:#fff;}.hBlock{background-color:#d7d7d7;color:#000;}.hBlockDrk{background-color:#585858;color:#fff;}.fBlock{background-color:#f2f2f2;color:#000;}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em;}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em;}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em;}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff;}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333;}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333;}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef;}.RowStyle{background-color:#eff3fb;text-align:left;}.rowStyle{background-color:#eff3fb;}.editRowStyle{background-color:#2461bf;}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f;}.alternatingRowStyle{background-color:#fff;}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff;}.spacedRow{line-height:3em;}.baseRow{background-color:#eff3fb;}.altRow{background-color:#fff;}.editRow{background-color:#2461bf;}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333;}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em;}.footerRow{background-color:#38c;font-weight:600;color:#fff;}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto;}.stortAscCellStyle{background-color:#f5f7fb;}.stortAscHeadStyle{background-color:#6d95e1;}.stortDescCellStyle{background-color:#e9ebef;}.stortDescHeadStyle{background-color:#4870be;}.GridPager{background-color:#ff7c50;}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold;}.imgNoPad{margin-top:-3px;margin-bottom:-7px;}@media all and (min-width:768px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:2em;}#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 +.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.smaller{font-size:.7em}.fullWidth>.navbar-nav{display:table;width:100%;margin:0}.fullWidth>.navbar-nav>li{float:none;display:table-cell;text-align:center}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#eee;color:#000}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.errore{color:#f00}.headLine{background-color:#38c;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn.btn-square{border-radius:0}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#38c;font-weight:600;color:#fff}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#d1ddf1;font-weight:600;color:#333}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef}.RowStyle{background-color:#eff3fb;text-align:left}.rowStyle{background-color:#eff3fb}.editRowStyle{background-color:#2461bf}.selectedRowStyle{background-color:#c1ccf1;font-weight:bold;Color:#36f}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.headerRowStyle{background-color:#5d7b9d;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#eff3fb}.altRow{background-color:#fff}.editRow{background-color:#2461bf}.selectedRow{background-color:#d1ddf1;font-weight:600;color:#333}.headerHighlight{font-weight:600;color:#38c;font-size:1.2em}.footerRow{background-color:#38c;font-weight:600;color:#fff}.pagerRow{background-color:#2461bf;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#2461bf}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#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/ScheMe-SP/WebUserControls/mod_bottom.ascx b/ScheMe-SP/WebUserControls/mod_bottom.ascx index 9ee9953..4a37f12 100644 --- a/ScheMe-SP/WebUserControls/mod_bottom.ascx +++ b/ScheMe-SP/WebUserControls/mod_bottom.ascx @@ -5,13 +5,40 @@ diff --git a/ScheMe-SP/WebUserControls/mod_bottom.ascx.cs b/ScheMe-SP/WebUserControls/mod_bottom.ascx.cs index c4a0f4c..7c93af7 100644 --- a/ScheMe-SP/WebUserControls/mod_bottom.ascx.cs +++ b/ScheMe-SP/WebUserControls/mod_bottom.ascx.cs @@ -27,7 +27,7 @@ namespace ScheMe.WebUserControls string answ = ""; string nome = nomeElem.ToString(); //if (Request.Url.ToString().Contains(nome)) answ = " btn-selected"; - answ = (Request.Url.ToString().Contains(nome)) ? " btn-selected" : "btn-unselected"; + answ = (Request.Url.ToString().Contains(nome)) ? " btn-selected" : " btn-unselected"; // se NON E' accettazione e non c'è paziente metto disabled... if (!nome.Contains("Accettazione")) { diff --git a/ScheMe-SP/obj/Debug/ScheMe.dll b/ScheMe-SP/obj/Debug/ScheMe.dll index 032805b..481690e 100644 Binary files a/ScheMe-SP/obj/Debug/ScheMe.dll and b/ScheMe-SP/obj/Debug/ScheMe.dll differ